summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-05-23 18:00:38 (GMT)
committerjenglish <jenglish@flightlab.com>2008-05-23 18:00:38 (GMT)
commitc2ee900569916fac1b939549e153c9344dca8c0a (patch)
tree9b81d31cd96417e8e81cb1e61fd01a90dc71f876
parent2652f3815730b047a1d7a1b8be97accec9da4d85 (diff)
downloadtk-c2ee900569916fac1b939549e153c9344dca8c0a.zip
tk-c2ee900569916fac1b939549e153c9344dca8c0a.tar.gz
tk-c2ee900569916fac1b939549e153c9344dca8c0a.tar.bz2
(remove conflict marker -- oops)
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1468ecc..513d8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@
* doc/ttk_*: 'identify' widget command is on all ttk widgets.
->>>>>>> 1.1929
2008-05-04 Joe English <jenglish@users.sourceforge.net>
* macosx/ttkMacOSAquaTheme.c: "default" and "focus" adornments