diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
| commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
| tree | c1d4adcda7f0b767537620aea02633158e17218a /core/patch | |
| parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
| parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'core/patch')
0 files changed, 0 insertions, 0 deletions