diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
| commit | 92116b44c20c9b8e3ee49b794084d08d22e87cd3 (patch) | |
| tree | ebfcd9f003924e328dd0ccdb16197c7e38c61dcf /community/preload/PKGBUILD | |
| parent | c89124d6a88f4cfffaba4492922c86091f2c8516 (diff) | |
| parent | 00f77ef3b2b7856520daba393370f67b773c2184 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gnustep-base/PKGBUILD
community-testing/gtranslator/PKGBUILD
community-testing/parrot/PKGBUILD
community/chmsee/PKGBUILD
core/lvm2/PKGBUILD
extra/php/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-openssl/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
testing/cairo/PKGBUILD
testing/eog-plugins/PKGBUILD
testing/eog/PKGBUILD
testing/gedit/PKGBUILD
testing/gjs/PKGBUILD
testing/glib2/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/gobject-introspection/PKGBUILD
testing/libpeas/PKGBUILD
testing/mutter/PKGBUILD
testing/openssl/PKGBUILD
testing/pygobject/PKGBUILD
testing/python/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/ruby/PKGBUILD
testing/ruby/ruby.install
testing/sushi/PKGBUILD
testing/totem/PKGBUILD
Diffstat (limited to 'community/preload/PKGBUILD')
0 files changed, 0 insertions, 0 deletions