Chaobin, Zhang 23ce61c395 Reverting failed mering of SOC2014_TASKBAR. ... Command: git svn dcommit is aborted, and the two branches is diverged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775		2014-09-10 11:57:58 +00:00
..
msvc/wx	Auto-link expat and zlib even in non-GUI programs when using MSVC.	2014-08-03 12:44:40 +00:00
wx	Reverting failed mering of SOC2014_TASKBAR.	2014-09-10 11:57:58 +00:00