diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
| commit | 4a133169d99e3d760caad3cbca2781872f4a0805 (patch) | |
| tree | 73d442004d2d4f70e0194bd78d6b293337ec2456 /extra/xfce4-mixer/PKGBUILD | |
| parent | a420f5c4c2a4eeb411175d086b339b620dba309d (diff) | |
| parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/freedroidrpg/PKGBUILD
community/lincity-ng/PKGBUILD
community/python2-pymongo/PKGBUILD
core/openssh/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
social/monkeysphere/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/inetutils/PKGBUILD
testing/inetutils/ftpd.service
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice-common.csh
testing/libreoffice/libreoffice-common.sh
testing/modemmanager/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/upower/PKGBUILD
Diffstat (limited to 'extra/xfce4-mixer/PKGBUILD')
0 files changed, 0 insertions, 0 deletions