merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/utils/Install/script/finished.ini
+++ b/utils/Install/script/finished.ini
@@ -0,0 +1,9 @@
+# Sample ini file for the last page
+#
+closeold
+grabfile,install.bmp
+loadwxr,finished.wxr
+setbutton,101,exit
+setbutton,103,exit
+disable,button3
+remove,install.bmp