diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
| commit | c2ef76f233a03e87ba6f2a39ca06d6c8411525bd (patch) | |
| tree | 443d415b43358dbcc1043b51f3299d3b07ee3c73 /community/libgoom2 | |
| parent | 3bcb803af0dd81dc1d1e3352d8dee1d731d33abb (diff) | |
| parent | defe74c9cba07c321ad2869d8f6872e64a167324 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/open-vm-tools/PKGBUILD
community-testing/open-vm-tools/vmware-guestd
extra/exo/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/imagemagick/PKGBUILD
extra/libindi/PKGBUILD
extra/libxfce4util/PKGBUILD
extra/terminal/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-dev-tools/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
extra/xfce4-weather-plugin/PKGBUILD
testing/cairo/PKGBUILD
testing/lvm2/PKGBUILD
testing/openmpi/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'community/libgoom2')
0 files changed, 0 insertions, 0 deletions