diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-30 10:35:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-30 10:35:40 +0200 |
| commit | 1addb62992395c33a9762e6b68259c59fa0c96f4 (patch) | |
| tree | 00d001e3a93cfb3a3b1f27f9cd52fcb58bb70999 /extra/haskell-zlib | |
| parent | 2d0e587bd1c7ac060a95a0e20cfe00ab19db7e14 (diff) | |
| parent | 263884f95012e159a0be10444ef96bbf56e70545 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/sword/PKGBUILD
extra/imagemagick/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/gnome-dictionary/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-screenshot/PKGBUILD
gnome-unstable/gnome-terminal/PKGBUILD
gnome-unstable/gucharmap/PKGBUILD
gnome-unstable/gucharmap/gucharmap.install
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/librsvg/PKGBUILD
gnome-unstable/mousetweaks/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'extra/haskell-zlib')
0 files changed, 0 insertions, 0 deletions