diff options
| author | jenglish <jenglish@flightlab.com> | 2008-05-23 18:00:38 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-05-23 18:00:38 (GMT) |
| commit | c2ee900569916fac1b939549e153c9344dca8c0a (patch) | |
| tree | 9b81d31cd96417e8e81cb1e61fd01a90dc71f876 /ChangeLog | |
| parent | 2652f3815730b047a1d7a1b8be97accec9da4d85 (diff) | |
| download | tk-c2ee900569916fac1b939549e153c9344dca8c0a.zip tk-c2ee900569916fac1b939549e153c9344dca8c0a.tar.gz tk-c2ee900569916fac1b939549e153c9344dca8c0a.tar.bz2 | |
(remove conflict marker -- oops)
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |