diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-20 09:26:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-20 09:26:44 +0200 |
| commit | 39c366b9fc1b83a741177d0b415a20147a18a3c0 (patch) | |
| tree | 24b520a26e042f10306b53e0fb579bab6343132b /community/pspshrink | |
| parent | 6d3d853af3b9042559c2d86a7e3907f97921fb28 (diff) | |
| parent | aad2fba0fc475162b566f1577d8e7a020cd9e80d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libcss/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/xorg-server/PKGBUILD
testing/openmpi/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'community/pspshrink')
0 files changed, 0 insertions, 0 deletions