diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
| commit | 3156702a5deccd61451be9f7d8ba0fd212a3043b (patch) | |
| tree | 624620bf3c78560df2455ebe11c66073a39d7355 /extra/kdegraphics-kcolorchooser | |
| parent | aa74620a7ef4a49bd466b993c4675514781bd179 (diff) | |
| parent | 4640048ddd1331c9f6fc14b8921ccecdb6b1ea11 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
core/nfs-utils/PKGBUILD
extra/libdmx/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libgweather/libgweather.install
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
testing/libxcb/PKGBUILD
testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
testing/libxi/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/kdegraphics-kcolorchooser')
0 files changed, 0 insertions, 0 deletions