diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-20 10:11:09 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-20 10:11:09 +0100 |
| commit | 4a9e8bf99c82c3a601cbee219eb14487f085975b (patch) | |
| tree | 88737c6b016bcdeeda69e031e5c3509d743bd518 /extra/kdeedu-parley | |
| parent | 067a3f8c6ecfe3dc81b09e96d1015ca6e61ff2e5 (diff) | |
| parent | 3cdbec41955c7232e91ef149f77ce9ed215a10fa (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/glee/PKGBUILD
extra/brasero/PKGBUILD
extra/cups/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoclue/PKGBUILD
extra/lilv/PKGBUILD
extra/php/PKGBUILD
extra/sord/PKGBUILD
extra/sqlite/PKGBUILD
extra/sratom/PKGBUILD
extra/suil/PKGBUILD
libre/clementine-libre/PKGBUILD
Diffstat (limited to 'extra/kdeedu-parley')
0 files changed, 0 insertions, 0 deletions