diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-17 10:57:14 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-17 10:57:14 +0100 |
| commit | c18c85b7c1dc723c11f7000dd6e3ade02dbe2653 (patch) | |
| tree | 77cf693a7525715f1a9b6b60aff4801988c000a1 /~lukeshu/openni | |
| parent | 7ea4029b5c539f8034fd970dbac58cc807fe0acf (diff) | |
| parent | 492f7c22a61fdb0488000da9f66d68e11bb43918 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/polkit-kde/PKGBUILD
extra/polkit-qt/PKGBUILD
Diffstat (limited to '~lukeshu/openni')
0 files changed, 0 insertions, 0 deletions