diff --git a/ChangeLog b/ChangeLog
index 1e1d2ba1..448ffaed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,381 @@
+2003/07/19 17:22:06 crs
+cmd/launcher/launcher.cpp
+cmd/launcher/launcher.rc
+cmd/launcher/resource.h
+cmd/synergyc/synergyc.cpp
+configure.in
+lib/client/CClient.cpp
+lib/client/CClient.h
+lib/client/CServerProxy.cpp
+lib/client/CServerProxy.h
+lib/common/Version.h
+lib/platform/CMSWindowsPrimaryScreen.cpp
+lib/platform/CMSWindowsPrimaryScreen.h
+lib/platform/CMSWindowsScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+lib/server/CConfig.cpp
+lib/synergy/OptionTypes.h
+
+Merge synergy 1.1 fixes into 1.0 branch.
+
+----------
+2003/07/19 17:19:26 crs
+
+Branched synergy 1.0 from 1.0.11.
+
+----------
+2003/07/17 21:16:58 crs
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+Fixed handling of a dead key followed by space on win32 and X11.
+A dead key followed by space should convert the dead key to a
+regular character.
+
+----------
+2003/07/16 22:38:43 crs
+lib/platform/CMSWindowsSecondaryScreen.cpp
+
+Fixed handling of some non-ASCII but directly mapped characters
+on win32.  The o, a, and u with diaeresis in the german keyboard
+mapping are examples.
+
+----------
+2003/07/16 21:40:57 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+
+Fixed handling of shift/ctrl/alt on special keys on win32 server.
+
+----------
+2003/07/13 20:42:11 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+
+Fixed handling of some keystrokes on win32.  Pressing a dead key
+and then space should convert the dead key to a non-dead key but
+previous the key was discarded.  Fixed that but VkKeyScan() fails
+in this case so added special case to fix that (assuming AltGr is
+required).  VkKeyScan() can return the wrong result for characters
+that have more than one virtual key mapped to them.  AltGr+9 (^)
+on the French layout has this problem.  Now detecting that problem
+and using the current keyboard state to decide if AltGr is
+required.
+
+----------
+2003/07/13 17:03:41 crs
+cmd/synergyc/synergyc.cpp
+
+Forgot to remove --camp and --no-camp from brief usage message.
+
+----------
+2003/07/13 16:57:08 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+
+Changed XSync() to XFlush() in X windows secondary screen.  This
+doesn't appear to have any negative consequences and may prevent
+synergy from freezing when some X client (probably the window
+manager) grabs the server.
+
+----------
+2003/07/12 17:57:31 crs
+cmd/synergyc/synergyc.cpp
+lib/client/CClient.cpp
+lib/client/CClient.h
+lib/platform/CMSWindowsScreen.cpp
+lib/platform/CXWindowsScreen.cpp
+
+Prevent INFO level log messages when client is repeatedly trying
+to connect.  This prevents a log from filling up while the client
+can't connect for no useful reason.  Also removed --camp option
+and cleaned up handling of client connection.  Users must now use
+--restart instead of --camp.
+
+----------
+2003/07/08 18:40:46 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+lib/platform/CMSWindowsPrimaryScreen.h
+
+Changed windows server to release ctrl and alt keys when it's
+sending a key that requires AltGr.  That's because AltGr *is*
+ctrl and alt but AltGr should be seen on clients as mode
+switch without the ctrl and alt.  I can't think of a better
+way to do this other than to not send modifier keystrokes to
+the clients at all.
+
+----------
+2003/07/05 17:06:18 crs
+configure.in
+lib/common/Version.h
+
+Change version to 1.0.11.  Skipping version 1.0.10 because there
+have been too many major changes since 1.0.8.  A new experimental
+release will provide a stable starting point for testing.
+
+----------
+2003/07/05 17:05:12 crs
+lib/synergy/CSecondaryScreen.cpp
+
+Fix to avoid warping mouse until client successfully connects to
+the server.
+
+----------
+2003/07/05 17:04:26 crs
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.h
+
+Keyboard fixes on win32.
+
+----------
+2003/07/05 17:04:06 crs
+lib/server/CConfig.h
+
+Fix for new template syntax.
+
+----------
+2003/07/05 14:49:08 crs
+lib/platform/CXWindowsPrimaryScreen.cpp
+lib/platform/CXWindowsPrimaryScreen.h
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+Minor X11 keyboard code cleanup.  Also now handling KeyPress with
+keycode == 0 generated by XFilterEvent() by using the keycode from
+the previous KeyPress.
+
+----------
+2003/07/05 14:47:41 crs
+lib/platform/CXWindowsScreen.cpp
+
+Compress sequential MappingNotify events into one.
+
+----------
+2003/07/01 19:35:28 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+
+Rewrote key handling on X11 client.  This should fix problems
+with applying the incorrect shift and mode switch modifiers to
+some keycodes, such as getting Pointer_EnableKeys when pressing
+shift with NumLock enabled.
+
+----------
+2003/06/22 21:27:38 crs
+lib/platform/CXWindowsPrimaryScreen.cpp
+lib/platform/CXWindowsPrimaryScreen.h
+
+Added support for input methods.  Only handling IMs that don't
+need a precompose area or status area.  This includes IMs that
+do simple dead key composition.  This only changes the server.
+The client still does not decompose a character it cannot
+generate directly into the keysyms to compose the character.
+
+----------
+2003/06/22 16:39:25 crs
+lib/client/CServerProxy.cpp
+
+More fixes for X11 client keyboard handling.
+
+----------
+2003/06/22 16:39:02 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+
+More fixes for X11 client keyboard handling.
+
+----------
+2003/06/22 15:01:44 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+
+Checkpoint for improving X11 client key handling.  Should prevent
+unintentional Pointer_EnableKeys (i.e. generating NumLock press
+and release around a shift press).
+
+----------
+2003/06/08 22:20:01 crs
+lib/platform/CXWindowsPrimaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+Another ctrl+alt+del checkpoint.
+
+----------
+2003/06/08 22:12:12 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.h
+lib/platform/CXWindowsPrimaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+ctrl+alt+del emulation checkpoint.
+
+----------
+2003/06/08 16:31:52 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+More DEBUG2 level debugging of keyboard handling.
+
+----------
+2003/06/08 15:42:05 crs
+lib/common/Makefile.am
+
+Added new file to Makefile.
+
+----------
+2003/06/02 20:07:16 crs
+lib/platform/CMSWindowsSecondaryScreen.cpp
+
+Fixed ctrl and alt keys on win32 clients.  Was broken by a recent
+fix to character handling.
+
+----------
+2003/06/02 20:06:20 crs
+lib/client/CServerProxy.cpp
+
+Fixed errors in log strings.
+
+----------
+2003/06/02 20:06:03 crs
+cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
+cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
+cmd/synergyc/resource.h
+cmd/synergyc/synergyc.cpp
+cmd/synergyc/synergyc.rc
+cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
+cmd/synergys/CMSWindowsServerTaskBarReceiver.h
+cmd/synergys/resource.h
+cmd/synergys/synergys.cpp
+cmd/synergys/synergys.rc
+lib/base/CLog.cpp
+lib/base/CLog.h
+lib/base/LogOutputters.cpp
+lib/base/LogOutputters.h
+lib/common/common.dsp
+lib/common/stddeque.h
+
+Added menu item on win32 tray icon to copy the last 1000 lines from
+the log to the clipboard.
+
+----------
+2003/05/26 09:50:35 crs
+lib/platform/CXWindowsClipboard.cpp
+
+Added workaround for broken clipboard owners that report the
+type of TARGETS as TARGETS instead of ATOM.
+
+----------
+2003/05/26 09:49:38 crs
+lib/platform/CMSWindowsClipboard.cpp
+
+No longer installing clibboard format for plain text on windows nt
+family because nt automatically converts to and from the unicode
+format.  This may fix text encoding errors when synergy puts
+non-ascii text on the clipboard and other clients prefer CF_TEXT
+to CF_UNICODE (which they should not because synergy lists
+CF_UNICODE first).
+
+----------
+2003/05/26 09:46:52 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+lib/platform/CMSWindowsScreen.cpp
+
+Fixed loss of ctrl+alt+del key releases when the Winlogin desktop
+is accessible (was already fixed when inaccessible).  This change
+also ignores press and release of virtual key 0, which should never
+happen but does according to one user.
+
+----------
+2003/05/21 21:22:14 crs
+lib/arch/CArchMultithreadWindows.cpp
+lib/synergy/CPrimaryScreen.cpp
+lib/synergy/CSecondaryScreen.cpp
+
+Fixed unsigned compare against zero.  Changed win32 priority to
+maximum.
+
+----------
+2003/05/21 19:38:11 crs
+lib/server/CServer.cpp
+lib/server/CServer.h
+
+Made double tap require moving farther away from the tapped edge
+before arming.  This should reduce spurious double taps.
+
+----------
+2003/05/20 19:15:58 crs
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.h
+
+Attempt to improve key event synthesis.  This change adds support
+for dead keys and attempts to choose the correct code page for the
+thread that will (probably) receive synthesized events.
+
+----------
+2003/05/20 19:14:40 crs
+lib/platform/CSynergyHook.cpp
+
+Minor thread ID compare fix.
+
+----------
+2003/05/20 19:14:24 crs
+lib/arch/CArchMultithreadWindows.cpp
+
+Reduced maximum priority in debug build.
+
+----------
+2003/05/17 20:58:27 crs
+lib/platform/CMSWindowsPrimaryScreen.cpp
+lib/platform/CMSWindowsPrimaryScreen.h
+lib/platform/CMSWindowsScreen.cpp
+lib/platform/CMSWindowsScreen.h
+lib/platform/CMSWindowsSecondaryScreen.cpp
+lib/platform/CMSWindowsSecondaryScreen.h
+lib/platform/CSynergyHook.cpp
+lib/platform/IMSWindowsScreenEventHandler.h
+lib/synergy/CPrimaryScreen.cpp
+
+Fixed getting locked to screen after ctrl+alt+del.  Also fixed
+cursor not being hidden on win32 server when on client screens
+(which happened when using low-level hooks).
+
+----------
+2003/05/17 14:10:11 crs
+INSTALL
+
+Added documentation for xtestIsXineramaUnaware option.
+
+----------
+2003/05/17 14:03:32 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+
+Fixed previous fix.  Was trying to avoid using XWarpPointer() when
+warping on screen 0.  That just doesn't work if screen 0 is not at
+0,0.  So now always use XWarpPointer() if there are multiple
+xinerama screens and the appropriate option is enabled.
+
+----------
+2003/05/17 13:44:24 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+lib/platform/CXWindowsSecondaryScreen.h
+lib/server/CConfig.cpp
+lib/synergy/OptionTypes.h
+
+Added workaround for when XTest is unaware of Xinerama.  When that's
+true, faking a mouse motion outside screen 0 is clamped onto screen 0.
+When the workaround is enabled, we use XWarpPointer() instead of an
+XTest fake motion.  This isn't perfect but the only real fix requires
+patching XTest.
+
+----------
+2003/05/17 12:48:32 crs
+lib/platform/CXWindowsSecondaryScreen.cpp
+
+Added support for old versions of XF86keysym.h that are missing
+some expected #defines.
+
+----------
 2003/05/10 17:27:05 crs
 configure.in
 lib/common/Version.h