diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
| commit | 127dc69a077301eaf514a49a1c8f883584396e1c (patch) | |
| tree | a48e082ea38a50dee109bbfe7d977b5a81c3c4a1 /testing/cryptsetup | |
| parent | b820811488f4e50bbff8e8e84af774adc79375d9 (diff) | |
| parent | a247f0004e94d32b5fe69a5123e1c6684d8cf096 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/audit/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/dia/PKGBUILD
community/gedit-plugins/PKGBUILD
community/giggle/PKGBUILD
community/gitg/PKGBUILD
community/gmic/PKGBUILD
community/gnome-applets/PKGBUILD
community/gnome-panel/PKGBUILD
community/gnome-screensaver/PKGBUILD
community/gtranslator/PKGBUILD
community/metacity/PKGBUILD
community/zeitgeist-datahub/PKGBUILD
core/glib2/PKGBUILD
core/perl/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/brltty/PKGBUILD
extra/cheese/PKGBUILD
extra/clutter/PKGBUILD
extra/cogl/PKGBUILD
extra/devhelp/PKGBUILD
extra/empathy/PKGBUILD
extra/eog/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gcr/PKGBUILD
extra/gdl/PKGBUILD
extra/gedit/PKGBUILD
extra/gjs/PKGBUILD
extra/glade/PKGBUILD
extra/glib-networking/PKGBUILD
extra/gnome-calculator/PKGBUILD
extra/gnome-contacts/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-documents/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-games/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-session/PKGBUILD
extra/gnome-terminal/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo-plugins/PKGBUILD
extra/gssdp/PKGBUILD
extra/gthumb/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gtksourceview3/PKGBUILD
extra/gucharmap/PKGBUILD
extra/gupnp-av/PKGBUILD
extra/gupnp-dlna/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/gupnp/PKGBUILD
extra/gvfs/PKGBUILD
extra/js/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgee/PKGBUILD
extra/libgweather/PKGBUILD
extra/liboauth/PKGBUILD
extra/libpeas/PKGBUILD
extra/librsvg/PKGBUILD
extra/libsocialweb/PKGBUILD
extra/libsoup/PKGBUILD
extra/mash/PKGBUILD
extra/modemmanager/PKGBUILD
extra/mutter/PKGBUILD
extra/mysql/PKGBUILD
extra/nautilus-sendto/PKGBUILD
extra/nautilus/PKGBUILD
extra/network-manager-applet/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/p11-kit/PKGBUILD
extra/pango/PKGBUILD
extra/pangomm/PKGBUILD
extra/polkit/PKGBUILD
extra/pygobject/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/rygel/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/totem/PKGBUILD
extra/vala/PKGBUILD
extra/vinagre/PKGBUILD
extra/vte3/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/yelp/PKGBUILD
extra/zeitgeist/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'testing/cryptsetup')
0 files changed, 0 insertions, 0 deletions