mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

Browse Source
This commit is contained in:
Robin Stuart 2016-12-23 16:48:37 +00:00
commit 5810252ab9
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
AC_INIT([zint], [2.5.2])
AC_INIT([zint], [2.5.3])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.

2
backend_tcl/lib/zint/pkgIndex.tcl
View File

@ -1,2 +1,2 @@
package ifneeded zint 2.5.2\
package ifneeded zint 2.5.3\
[list load [file join $dir zint[info sharedlibextension]]]

6
backend_tcl/zint.c
View File

@ -37,7 +37,9 @@
- Added Codablock F options "-rows".
- Adopted to new image format of zint
2016-10-14 2.5.2 HaO
- Include the upstream reverted image format
- Include the upstream reverted image format
2016-12-12 2.5.3 HaO
- No changes here, take 2.5.1 framework files
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -77,7 +79,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
#define VERSION "2.5.2"
#define VERSION "2.5.3"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */

2
win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
View File

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.5\"" /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.5.1\"" /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe