office-gobmx/cairo
Bjoern Michaelsen 31daa1bd60 Merge branch 'master' into feature/gnumake4
Conflicts:
	cairo/cairo-1.8.0.patch
	cairo/prj/build.lst
	gdk-pixbuf/makefile.mk
	libcroco/makefile.mk
2011-06-19 12:03:35 +02:00
..
cairo Fix configury for Android, but won't build 2011-06-10 00:07:14 +03:00
pixman Fix configury for Android, but won't build 2011-06-10 00:07:14 +03:00
prj Merge branch 'master' into feature/gnumake4 2011-06-19 12:03:35 +02:00
cairo-1.8.0.patch Merge branch 'master' into feature/gnumake4 2011-06-19 12:03:35 +02:00
pixman-0.12.0.patch Fix configury for Android, but won't build 2011-06-10 00:07:14 +03:00