diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
| commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
| tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /community/gtk2fontsel | |
| parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
| parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'community/gtk2fontsel')
0 files changed, 0 insertions, 0 deletions