Sam Lown 68de839804 Merge branch 'master' of git://zint.git.sourceforge.net/gitroot/zint/zint ...

Conflicts:
	backend/CMakeLists.txt
	backend/Makefile
	backend/Makefile.mingw
	backend/library.c
	backend/zint.h

2010-06-11 20:10:55 +02:00

30 B

Raw Blame History

View Raw