diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-01 10:41:09 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-01 10:41:09 +0200 |
| commit | aa100084bd4ba3ebc3f452ad2cc1acbf8f253a17 (patch) | |
| tree | b7f1124277c02cace71cad2b6290dd010796df07 /extra/imlib | |
| parent | 22a099ec0cc8532196da82ff11d6fb2b3b34fea8 (diff) | |
| parent | 939efb693a8b362edc0c6ccba62c5ce54fb501af (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/sqlite3/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/brasero/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/devhelp/PKGBUILD
gnome-unstable/eog-plugins/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gcalctool/PKGBUILD
gnome-unstable/gdl/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/glade/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-games/gnome-games.install
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-search-tool/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/vala/PKGBUILD
gnome-unstable/vinagre/PKGBUILD
gnome-unstable/vino/PKGBUILD
gnome-unstable/yelp/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/wine/PKGBUILD
testing/libarchive/PKGBUILD
testing/openssl/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'extra/imlib')
0 files changed, 0 insertions, 0 deletions