diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
| commit | d53c17bfc7766efa4bcb43eecc2906938d3d2ee9 (patch) | |
| tree | 8f29b8f00ba7758d04e66c3b3ab2bbe71363bceb /community/gnunet-gtk | |
| parent | 23c40f4e35b9164f83c5bcf376056bca0546f69e (diff) | |
| parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/freewrl/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/gpac/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/smc/PKGBUILD
community/blobby2/PKGBUILD
community/jack2/PKGBUILD
community/kleansweep/PKGBUILD
core/gcc/PKGBUILD
extra/at/PKGBUILD
extra/maxima/PKGBUILD
extra/nicotine/PKGBUILD
extra/python-geoip/PKGBUILD
extra/sqlite/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gst-plugins-base/PKGBUILD
gnome-unstable/gstreamer/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/libtool-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
staging/mesa/PKGBUILD
testing/bzflag/PKGBUILD
testing/cabal-install/PKGBUILD
testing/cairo/PKGBUILD
testing/gcc/PKGBUILD
testing/glew/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libtool/PKGBUILD
testing/mesa/PKGBUILD
testing/nx/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-intel/xf86-video-intel.install
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'community/gnunet-gtk')
0 files changed, 0 insertions, 0 deletions