diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
| commit | 81c145bbc94619d18db270991d31912a3d50c43b (patch) | |
| tree | d4019392a513b226493ade11b1486d73dbb1e68e /extra/naim | |
| parent | 4290dec175736d43c7df289c599f553c469f3678 (diff) | |
| parent | 0a7c64736c0b026c3105928d89500a8af1ad5eac (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/recoll/PKGBUILD
core/dnsutils/PKGBUILD
core/tzdata/PKGBUILD
extra/cabal-install/PKGBUILD
extra/feh/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/indent/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libktorrent/PKGBUILD
libre/mplayer-libre/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/wine/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim/PKGBUILD
testing/bluez/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
Diffstat (limited to 'extra/naim')
0 files changed, 0 insertions, 0 deletions