diff options
| author | jenglish@flightlab.com <jenglish> | 2008-05-23 18:00:38 (GMT) |
|---|---|---|
| committer | jenglish@flightlab.com <jenglish> | 2008-05-23 18:00:38 (GMT) |
| commit | 4e881670e6a903d14363ef61f2b09cc7878efd8f (patch) | |
| tree | 9b81d31cd96417e8e81cb1e61fd01a90dc71f876 | |
| parent | 5d3209d91617dbaf782f1d4dd777fe883a00045a (diff) | |
| download | tk-4e881670e6a903d14363ef61f2b09cc7878efd8f.zip tk-4e881670e6a903d14363ef61f2b09cc7878efd8f.tar.gz tk-4e881670e6a903d14363ef61f2b09cc7878efd8f.tar.bz2 | |
(remove conflict marker -- oops)
| -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 |