diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
| commit | 6cc3a23ea1231ea627394677df2bebdc403acb38 (patch) | |
| tree | 14c20984a10df92c0b5cbb3b4477f0358cf8b01f /community/gadmin-samba | |
| parent | 8e40bdbb2496be15fdba2e683af427bc2333be42 (diff) | |
| parent | 3741146d50cb93e8985f8aac937e36d35ee76446 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/torcs/PKGBUILD
community/fceux/PKGBUILD
core/gcc/PKGBUILD
core/wireless_tools/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/gtk2/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdelibs/PKGBUILD
testing/libarchive/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/udev/PKGBUILD
Diffstat (limited to 'community/gadmin-samba')
0 files changed, 0 insertions, 0 deletions