Fredrik Rinnestam 9adf30b786 Merge branch '3.0' into 3.1 ...

Conflicts:
	chromium/.footprint
	chromium/.md5sum
	chromium/Pkgfile
	cups-filters/.md5sum
	cups-filters/Pkgfile
	distribute/.md5sum
	distribute/Pkgfile
	dovecot/.md5sum
	dovecot/Pkgfile
	elfutils/.footprint
	elfutils/.md5sum
	elfutils/Pkgfile
	firefox/.footprint
	firefox/.md5sum
	firefox/Pkgfile
	flash-player-plugin/.md5sum
	flash-player-plugin/Pkgfile
	gdk-pixbuf/.footprint
	gdk-pixbuf/.md5sum
	gdk-pixbuf/Pkgfile
	git/.md5sum
	git/Pkgfile
	gnutls/.footprint
	gnutls/.md5sum
	gnutls/Pkgfile
	gtk3/.footprint
	gtk3/.md5sum
	gtk3/Pkgfile
	harfbuzz/.footprint
	harfbuzz/.md5sum
	harfbuzz/Pkgfile
	libpcap/.footprint
	libpcap/.md5sum
	libpcap/Pkgfile
	mod_php/.md5sum
	mod_php/Pkgfile
	mysql/.md5sum
	mysql/Pkgfile
	nss/.md5sum
	nss/Pkgfile
	php-fcgi/.md5sum
	php-fcgi/Pkgfile
	php-fpm/.md5sum
	php-fpm/Pkgfile
	php-mysql/.md5sum
	php-mysql/Pkgfile
	php-sqlite3/.md5sum
	php-sqlite3/Pkgfile
	php/.md5sum
	php/Pkgfile
	poppler-glib/.md5sum
	poppler-glib/Pkgfile
	poppler-qt4/.md5sum
	poppler-qt4/Pkgfile
	poppler/.md5sum
	poppler/Pkgfile
	radeon-ucode/.md5sum
	radeon-ucode/Pkgfile
	samba/.md5sum
	samba/Pkgfile
	setuptools/.footprint
	setuptools/Pkgfile
	sqlite3/.md5sum
	sqlite3/Pkgfile
	wine/.md5sum
	wine/Pkgfile
	xterm/.md5sum
	xterm/Pkgfile

2014-02-15 21:57:12 +01:00

..

.footprint

gdk-pixbuf: updated to 2.30.3

2014-01-24 21:37:35 +01:00

.md5sum

gdk-pixbuf: updated to 2.30.3

2014-01-24 21:37:35 +01:00

gdk-pixbuf-register.sh

gdk-pixbuf: readded xlib support

2012-06-15 01:37:25 +02:00

gdk-pixbuf.loaders

gdk-pixbuf: updated to 2.26.5

2012-11-10 21:09:31 +01:00

Pkgfile

Merge branch '3.0' into 3.1

2014-02-15 21:57:12 +01:00