diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-10 10:24:53 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-10 10:24:53 +0100 |
| commit | 61da6ed883804e3fb97bc1ad314585a52383cf4c (patch) | |
| tree | de51a9925d95f31c897f841aeb0d8fa075b1461d /~xihh | |
| parent | 0a353bad57296d34a69b3df25e53a6b00d3bd369 (diff) | |
| parent | 6ee08d6a9217906f2ef84f70923d3d362d4b40ad (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/luajit/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/xine-lib/PKGBUILD
libre/cups-filters-libre/PKGBUILD
libre/file-roller-libre/PKGBUILD
Diffstat (limited to '~xihh')
0 files changed, 0 insertions, 0 deletions