Merge in from trunk r68684 - r69046
authorSteve Lamerton <steve.lamerton@gmail.com>
Sat, 10 Sep 2011 15:09:22 +0000 (15:09 +0000)
committerSteve Lamerton <steve.lamerton@gmail.com>
Sat, 10 Sep 2011 15:09:22 +0000 (15:09 +0000)
commit1d156af3247c862e51a7c62f569a3fd302052a42
tree4e5166462d8569f1d45faadfdf5406cb35539989
parentd4adec8361e043fe89e9e102f8848b88ede67f1a
parent01bd848eb9699a60e0bdd5105b9a9c591c9e1b20
Merge in from trunk r68684 - r69046

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
29 files changed:
Makefile.in
autoconf_inc.m4
build/bakefiles/files.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
configure
configure.in
docs/doxygen/mainpages/const_wxusedef.h
include/wx/compositewin.h
include/wx/msw/setup0.h
include/wx/setup_inc.h
samples/xrc/makefile.bcc
samples/xrc/makefile.gcc
samples/xrc/makefile.vc
samples/xrc/makefile.wat
setup.h.in
src/msw/anybutton.cpp
tests/Makefile.in
tests/makefile.bcc
tests/makefile.gcc
tests/makefile.vc
tests/makefile.wat
tests/test.bkl
tests/test_test_gui.dsp
tests/test_vc7_test_gui.vcproj
tests/test_vc8_test_gui.vcproj
tests/test_vc9_test_gui.vcproj