diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-09-20 11:10:35 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-09-20 11:10:35 (GMT) |
| commit | 19573d18fde3bb608bea8b31dc305cd6ce89d672 (patch) | |
| tree | 6a3815a0cda3d9049ae2f7102f42dc5bc440f620 /win | |
| parent | 82a277928b3b076a43036ae78cf6abc857158a8b (diff) | |
| parent | 47bcb0359373bad17cdf5676fb0c616c60c6e94e (diff) | |
| download | tk-revised_text.zip tk-revised_text.tar.gz tk-revised_text.tar.bz2 | |
Merge trunkrevised_text
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 1 | ||||
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/configure.ac | 2 | ||||
| -rw-r--r-- | win/makefile.vc | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index e25f6ed..1f2a75e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -318,6 +318,7 @@ TK_OBJS = \ tkGrid.$(OBJEXT) \ tkImage.$(OBJEXT) \ tkImgBmap.$(OBJEXT) \ + tkImgListFormat.$(OBJEXT) \ tkImgGIF.$(OBJEXT) \ tkImgPNG.$(OBJEXT) \ tkImgPPM.$(OBJEXT) \ diff --git a/win/configure b/win/configure index 0149709..15765cd 100755 --- a/win/configure +++ b/win/configure @@ -2133,7 +2133,7 @@ SHELL=/bin/sh TK_VERSION=8.7 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=7 -TK_PATCH_LEVEL="a0" +TK_PATCH_LEVEL="a2" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.ac b/win/configure.ac index cdef517..6a542f3 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -14,7 +14,7 @@ SHELL=/bin/sh TK_VERSION=8.7 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=7 -TK_PATCH_LEVEL="a0" +TK_PATCH_LEVEL="a2" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/makefile.vc b/win/makefile.vc index a1d37f3..0187647 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -326,6 +326,7 @@ TKOBJS = \ $(TMP_DIR)\tkGrid.obj \
$(TMP_DIR)\tkImage.obj \
$(TMP_DIR)\tkImgBmap.obj \
+ $(TMP_DIR)\tkImgListFormat.obj \
$(TMP_DIR)\tkImgGIF.obj \
$(TMP_DIR)\tkImgPNG.obj \
$(TMP_DIR)\tkImgPPM.obj \
|
