diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-06-17 13:55:24 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-06-17 13:55:24 -0400 |
commit | 7d260c2da56c08b0b7991838533c223641bebbfb (patch) | |
tree | 72a8c2cfbc303370312c1fa291451452590fedf4 /~lukeshu/openni-all | |
parent | a67fa7fcea87eef9d885b3af3344e4f0d39ddcba (diff) | |
parent | 7326e5293727cc1461fa92c2ba6868fba49456ae (diff) | |
download | abslibre-7d260c2da56c08b0b7991838533c223641bebbfb.tar.gz abslibre-7d260c2da56c08b0b7991838533c223641bebbfb.tar.bz2 abslibre-7d260c2da56c08b0b7991838533c223641bebbfb.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts:
libre/mozilla-searchplugins/PKGBUILD
Diffstat (limited to '~lukeshu/openni-all')
0 files changed, 0 insertions, 0 deletions