diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
| commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
| tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /~fauno | |
| parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
| parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions