diff options
| author | nijtmans <nijtmans> | 2008-11-19 00:21:09 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-11-19 00:21:09 (GMT) |
| commit | 61da727482cbd02e743f7da6479e4a9792438791 (patch) | |
| tree | 938b03a11288f9335a174055413ddaf2624c4260 | |
| parent | 00d49f9867cee2ccb0107d42c242542bb1724968 (diff) | |
| download | tk-61da727482cbd02e743f7da6479e4a9792438791.zip tk-61da727482cbd02e743f7da6479e4a9792438791.tar.gz tk-61da727482cbd02e743f7da6479e4a9792438791.tar.bz2 | |
remove unnoticed CVS conflict in ChangeLog
| -rw-r--r-- | ChangeLog | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -55,7 +55,6 @@ 2008-11-11 Jan Nijtmans <nijtmans@users.sf.net> -<<<<<<< ChangeLog * win/tcl.m4: reverted change from 2008-11-06 (was under the impression that "-Wno-implicit-int" added an extra warning) * win/configure (regenerated) @@ -72,26 +71,6 @@ * doc/CrtImgType.3 binary compatible with the old interface, but not fully source compatible (although tkImg does not suffer). * generic/tkDecls.h (regenerated) -======= - * win/tcl.m4: Reverted change from 2008-11-06 (was under the - impression that "-Wno-implicit-int" added an extra - warning). - * win/configure: (regenerated) - * unix/tcl.m4: Use -O2 as gcc optimization compiler flag, and get rid - of -Wno-implicit-int for UNIX. - * unix/configure: (regenerated) - - * generic/tk.decls: Modify Tk_Create(Old)ImageType signature, - * generic/tk.h: relaxing the constraint that every Tk_ImageType - * generic/tkImage.c: can only be passed to this function once. This - * generic/tkImgBmap.c: allows tkImg to be loaded in multiple - * generic/tkImgPhoto.c:interpreters in a thread-enabled build of Tk. - * generic/tkTest.c: This CONSTification complies with TIP #27. It - * doc/CrtImgType.3: is binary compatible with the old interface, - but not fully source compatible (although - tkImg does not suffer). - * generic/tkDecls.h: (regenerated) ->>>>>>> 1.2071 *** POTENTIAL INCOMPATIBILITY *** |