git.saurik.com Git - wxWidgets.git/commit

projects / wxWidgets.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0995b9d f0e5d5d)

author	Steve Lamerton <steve.lamerton@gmail.com>
	Mon, 25 Jul 2011 16:54:53 +0000 (16:54 +0000)
committer	Steve Lamerton <steve.lamerton@gmail.com>
	Mon, 25 Jul 2011 16:54:53 +0000 (16:54 +0000)
commit	906c935a80b10d53cecf57f71ab5f3f4f1d529ec
tree	54dc07034ed864a9389e3a189ef3fb657613723f	tree
parent	0995b9dc18a7ce898c1c1be0e2790b258cab0fee	commit \| diff
parent	f0e5d5d22ce012e9312a63175d79c0f4a8d444be	commit \| diff

Merge in from trunk r67662 to r64801

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

17 files changed:

build/bakefiles/files.bkl	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
include/wx/dlimpexp.h	diff1 \|	diff2 \|	blob \| history
include/wx/msw/panel.h	diff1 \|	diff2 \|	blob \| history
include/wx/msw/setup0.h	diff1 \|	diff2 \|	blob \| history
include/wx/setup_inc.h	diff1 \|	diff2 \|	blob \| history
locale/it.po	diff1 \|	diff2 \|	blob \| history
src/msw/panel.cpp	diff1 \|	diff2 \|	blob \| history
tests/makefile.bcc	diff1 \|	diff2 \|	blob \| history
tests/makefile.gcc	diff1 \|	diff2 \|	blob \| history
tests/makefile.vc	diff1 \|	diff2 \|	blob \| history
tests/makefile.wat	diff1 \|	diff2 \|	blob \| history
tests/test.bkl	diff1 \|	diff2 \|	blob \| history
tests/test_test_gui.dsp	diff1 \|	diff2 \|	blob \| history
tests/test_vc7_test_gui.vcproj	diff1 \|	diff2 \|	blob \| history
tests/test_vc8_test_gui.vcproj	diff1 \|	diff2 \|	blob \| history
tests/test_vc9_test_gui.vcproj	diff1 \|	diff2 \|	blob \| history

wxWidgets (Impactor)