diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 11:57:36 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 11:57:36 +0100 |
| commit | 0faf579c24046ce4256b76c0cedf751c3ef024a2 (patch) | |
| tree | b34add6ffaf593bb556a93ac0fad20eda4204606 /~mtjm | |
| parent | 415b1b011936d464fe3042233910d0ac14a8d858 (diff) | |
| parent | de078a89b9e3a45b6b2e3f0c9d866962e5125ba3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/amsn/PKGBUILD
community/luakit/PKGBUILD
testing/feh/PKGBUILD
testing/gimp/PKGBUILD
testing/libpng/PKGBUILD
testing/libwebkit/PKGBUILD
testing/php/PKGBUILD
testing/vlc/PKGBUILD
Diffstat (limited to '~mtjm')
0 files changed, 0 insertions, 0 deletions