diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/SAFARI_MERGE | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/SAFARI_MERGE')
| -rw-r--r-- | khtml/SAFARI_MERGE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/SAFARI_MERGE b/khtml/SAFARI_MERGE index 4c48e6b34..7ef67e134 100644 --- a/khtml/SAFARI_MERGE +++ b/khtml/SAFARI_MERGE @@ -82,7 +82,7 @@ Needs other stuff before it can be applied: =========================================================================== - decoder.cpp/.h: changes in APPLE_CHANGES #ifdef that make decoder - being a null wrapper just using tqunicode directly instead of working + being a null wrapper just using unicode directly instead of working on charset specific 8bit data. - htmltags.in: removal of <-konqblock>, not sure if that should ever @@ -112,7 +112,7 @@ changes that need to be merged: IMO to speed up style stuff. Should IMO be separated out into a font_mac.cpp and font_x11.cpp -- tqrepaint has gotten a bool immediate +- repaint has gotten a bool immediate - render_applet.cpp: small #ifdef APPLE changes |