mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-06-01 15:48:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removing merge nastynesses

Browse source
This commit is contained in:
Sam Lown 2010-06-11 20:14:41 +02:00
parent 68de839804
commit 95e51cf96d
3 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/CMakeLists.txt
View file

@ -4,11 +4,7 @@ project(zint)
find_package(PNG)
<<<<<<< HEAD
set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c)
=======
set(zint_COMMON_SRCS common.c library.c ps.c large.c reedsol.c gs1.c svg.c png.c)
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c)
set(zint_POSTAL_SRCS postal.c auspost.c imail.c)
set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c)