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
This commit is contained in:
Sam Lown
2010-06-11 20:10:55 +02:00
6 changed files with 22 additions and 0 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
build/
*.swp
*.swo
.directory