diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
| commit | 6b67b8c583b321bc955bc8efd24befe40d15e9fc (patch) | |
| tree | 61148cd550443788030ce27e3d7bee9fb9daf57e /testing/bitlbee | |
| parent | 8ba6ee51e836f2a5b78c7d6ca0096ddb5f847833 (diff) | |
| parent | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang-sdl/PKGBUILD
community/nautilus-sound-converter/PKGBUILD
community/shapelib/PKGBUILD
core/libarchive/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/evince/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/libgxps/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qt5/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
libre/kernel26-libre-lts/PKGBUILD
Diffstat (limited to 'testing/bitlbee')
0 files changed, 0 insertions, 0 deletions