another merge from WX_2_6_BRANCH

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 07:05:15 +00:00
parent 2091f5e71a
commit 095315e20d
41 changed files with 3008 additions and 38638 deletions
--- a/wxPython/docs/BUILD.html
+++ b/wxPython/docs/BUILD.html
@@ -78,6 +78,7 @@ cd bld
             --enable-debug \
             --enable-geometry \
             --enable-sound --with-sdl \
+             --enable-mediactrl \
             --enable-display \
             --disable-debugreport \
 </pre>