diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-06 21:36:45 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-06 21:36:45 -0600 |
commit | 8ec4b9333a52352dc0030f2368e851404fb14e65 (patch) | |
tree | 45c9f623ca59e6da9a7243c870b7693d6b50f667 /social/tokyotyrant | |
parent | e1775e3c54b852a7d349b4a818794adb8f81487f (diff) | |
parent | fc7e49d04d3f1b8e84dbb6fb0cc76e417d362b4c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts:
libre/libretools/PKGBUILD
Diffstat (limited to 'social/tokyotyrant')
0 files changed, 0 insertions, 0 deletions