diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
| commit | d8eb584da3a24a7b4cccf1b4b39b19ca8fc19495 (patch) | |
| tree | 8e5ea3b068852a348646a0543fdacbd7de7a937e /extra/trayer/trayer.diff | |
| parent | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (diff) | |
| parent | 299e917c17619f800f0c21cf43209065b608223f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/pigeonhole/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/remmina/PKGBUILD
core/crda/PKGBUILD
core/libnl/PKGBUILD
core/wpa_supplicant/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/maxima/PKGBUILD
extra/vcdimager/PKGBUILD
extra/vlc/PKGBUILD
extra/xfdesktop/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/q4wine/PKGBUILD
testing/dovecot/PKGBUILD
Diffstat (limited to 'extra/trayer/trayer.diff')
0 files changed, 0 insertions, 0 deletions