diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-31 12:17:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-31 12:17:44 +0200 |
| commit | 22a099ec0cc8532196da82ff11d6fb2b3b34fea8 (patch) | |
| tree | 1ef727a0b8dc9350430882f3086d4c17d01ce970 /core/xinetd | |
| parent | eaaf1e91b1d47d25856928ed24efcb6e99faae8e (diff) | |
| parent | 977b78df305a06797773799a7295f2a5f3f013cf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libzip/PKGBUILD
extra/qt/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-disk-utility/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-font-viewer/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-system-log/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libimobiledevice/PKGBUILD
gnome-unstable/libplist/PKGBUILD
libre/grub2/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-__i686.patch
multilib/lib32-qt/PKGBUILD
testing/dhcpcd/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc-__i686.patch
Diffstat (limited to 'core/xinetd')
0 files changed, 0 insertions, 0 deletions