diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
| commit | 09dd4a97fccc4bcabe341c4e4490004385283e53 (patch) | |
| tree | d00a22a0304969ff70ecc680f3e89b5fab1ecce6 /extra/libxss | |
| parent | 3a3f329b736af639fdd3c9621816bad627b96903 (diff) | |
| parent | 4982c269b318734d01ad30c6592fbb73565ceb12 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gource/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/wt/PKGBUILD
extra/cups/PKGBUILD
extra/libwacom/PKGBUILD
extra/python-urwid/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-readline/PKGBUILD
staging/hugin/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-no-gzip-man.patch
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/libxss')
0 files changed, 0 insertions, 0 deletions