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
..
prj
libcroco-0.6.2.patch
makefile.mk	Merge branch 'master' into feature/gnumake4	2011-06-19 12:03:35 +02:00