diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
| commit | 7e6a790c47fb44426cdda8ea0aca8c247a524c5e (patch) | |
| tree | a120e55f735660c1ab1e7fa6174fe28fb3108d1f /extra/bitlbee | |
| parent | e5592a9039761a22a117469303c77a4215ad5048 (diff) | |
| parent | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gpsmanshp/PKGBUILD
community/parrot/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmtp/PKGBUILD
extra/libreoffice/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-libx11/PKGBUILD
testing/xf86-video-mga/PKGBUILD
testing/xf86-video-mga/git-fixes.patch
Diffstat (limited to 'extra/bitlbee')
0 files changed, 0 insertions, 0 deletions