Resolved CVS conflict
authorJulian Smart <julian@anthemion.co.uk>
Thu, 4 Aug 2005 10:05:41 +0000 (10:05 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Thu, 4 Aug 2005 10:05:41 +0000 (10:05 +0000)
commitb7972e1fa8a66f67262edff466416f6a5bedc48c
tree9aeefd45caab7704316d4f513e446360c704e40e
parent6ebeb4c7217afa0262fda17e71d698f0bcd3fa3a
Resolved CVS conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/msw/wince/setup.h