diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2011-09-06 15:52:03 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2011-09-06 15:52:03 +0400 |
commit | 040b590e4b7bf5e18a46f0e57550b63b1689baa9 (patch) | |
tree | cc957cad09cfb9d7c02f1742c0922e2f3b1ae073 | |
parent | 352ae7754b8c0df5b4fa5b421396d8925c587877 (diff) | |
parent | 4887b690ec309154b1b76f493876a7a7f4985266 (diff) |
Merge branch '2.6' of github.com:mono/monodevelop into 2.6
-rwxr-xr-x | extras/AspNetEdit/configure | 2 | ||||
-rwxr-xr-x | extras/BooBinding/configure | 2 | ||||
-rwxr-xr-x | extras/GeckoWebBrowser/configure | 2 | ||||
-rwxr-xr-x | extras/JavaBinding/configure | 2 | ||||
-rwxr-xr-x | extras/MonoDevelop.AddinAuthoring/configure | 2 | ||||
-rwxr-xr-x | extras/MonoDevelop.Debugger.Gdb/configure | 2 | ||||
-rwxr-xr-x | extras/MonoDevelop.Debugger.Mdb/configure | 2 | ||||
-rw-r--r-- | extras/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid.addin.xml | 2 | ||||
-rw-r--r-- | extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml | 2 | ||||
-rwxr-xr-x | extras/PyBinding/configure | 2 | ||||
-rwxr-xr-x | extras/WebKitWebBrowser/configure | 2 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs | 4 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/SplashScreen.png | bin | 46972 -> 107982 bytes | |||
-rw-r--r-- | profiles/dist | 6 |
14 files changed, 19 insertions, 13 deletions
diff --git a/extras/AspNetEdit/configure b/extras/AspNetEdit/configure index 014cc1f776..f6482315aa 100755 --- a/extras/AspNetEdit/configure +++ b/extras/AspNetEdit/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=aspnetedit prefix=/usr/local config=DEBUG diff --git a/extras/BooBinding/configure b/extras/BooBinding/configure index 6c3a61538d..050f13d213 100755 --- a/extras/BooBinding/configure +++ b/extras/BooBinding/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=monodevelop-boo prefix=/usr/local config=DEBUG diff --git a/extras/GeckoWebBrowser/configure b/extras/GeckoWebBrowser/configure index e80a03fa90..999ea97867 100755 --- a/extras/GeckoWebBrowser/configure +++ b/extras/GeckoWebBrowser/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=geckowebbrowser prefix=/usr/local config=DEBUG diff --git a/extras/JavaBinding/configure b/extras/JavaBinding/configure index d58c308493..9bb88bf176 100755 --- a/extras/JavaBinding/configure +++ b/extras/JavaBinding/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=monodevelop-java prefix=/usr/local config=DEBUG diff --git a/extras/MonoDevelop.AddinAuthoring/configure b/extras/MonoDevelop.AddinAuthoring/configure index a4f719062d..911b4ae61b 100755 --- a/extras/MonoDevelop.AddinAuthoring/configure +++ b/extras/MonoDevelop.AddinAuthoring/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=0.2 +VERSION=2.6 PACKAGE=monodevelop_addinauthoring prefix=/usr/local config=DEBUG diff --git a/extras/MonoDevelop.Debugger.Gdb/configure b/extras/MonoDevelop.Debugger.Gdb/configure index 3846d77e20..4d46795bbc 100755 --- a/extras/MonoDevelop.Debugger.Gdb/configure +++ b/extras/MonoDevelop.Debugger.Gdb/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=monodevelop-debugger-gdb prefix=/usr/local config=DEBUG diff --git a/extras/MonoDevelop.Debugger.Mdb/configure b/extras/MonoDevelop.Debugger.Mdb/configure index a2de90ec3e..d3f213b384 100755 --- a/extras/MonoDevelop.Debugger.Mdb/configure +++ b/extras/MonoDevelop.Debugger.Mdb/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=monodevelop-debugger-mdb prefix=/usr/local config=DEBUG diff --git a/extras/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid.addin.xml b/extras/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid.addin.xml index 081027d7d7..59919d3aba 100644 --- a/extras/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid.addin.xml +++ b/extras/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid/MonoDevelop.MonoDroid.addin.xml @@ -6,7 +6,7 @@ url = "http://mono-android.net/" description = "Support for developing and deploying Mono for Android applications." category = "Mobile Development" - version = "2.6.0"> + version = "2.6.5.5"> <Header> <Icon32>icons/monodroid-32.png</Icon32> diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml index e19a734680..ab038261b2 100644 --- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml +++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml @@ -6,7 +6,7 @@ url = "http://monodevelop.com/" description = "Support for developing MonoMac applications" category = "Mac Development" - version = "2.6.0"> + version = "2.6.0.62"> <Runtime> <Import file = "templates/MonoMacProject.xpt.xml"/> diff --git a/extras/PyBinding/configure b/extras/PyBinding/configure index e1e0b161a8..d4bca215b6 100755 --- a/extras/PyBinding/configure +++ b/extras/PyBinding/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=2.5.93 +VERSION=2.6 PACKAGE=monodevelop-python prefix=/usr/local config=DEBUG diff --git a/extras/WebKitWebBrowser/configure b/extras/WebKitWebBrowser/configure index c29de18b7c..0e992c1b81 100755 --- a/extras/WebKitWebBrowser/configure +++ b/extras/WebKitWebBrowser/configure @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=0.1 +VERSION=2.6 PACKAGE=webkitwebbrowser prefix=/usr/local config=DEBUG diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs index 30246c9c81..fd60205f3e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs @@ -90,12 +90,12 @@ namespace MonoDevelop.Ide.Gui.Dialogs { public void SetMessage (string Message) { - if (bitmap == null) { +/* if (bitmap == null) { label.Text = Message; } else { label.Markup = "<span size='small' foreground='white'>" + Message + "</span>"; } - RunMainLoop (); + RunMainLoop ();*/ } static void RunMainLoop () diff --git a/main/src/core/MonoDevelop.Ide/icons/SplashScreen.png b/main/src/core/MonoDevelop.Ide/icons/SplashScreen.png Binary files differindex 136ed57645..062acf7d25 100644 --- a/main/src/core/MonoDevelop.Ide/icons/SplashScreen.png +++ b/main/src/core/MonoDevelop.Ide/icons/SplashScreen.png diff --git a/profiles/dist b/profiles/dist new file mode 100644 index 0000000000..37aa650ffe --- /dev/null +++ b/profiles/dist @@ -0,0 +1,6 @@ +main +extras/JavaBinding +extras/ValaBinding +extras/MonoDevelop.Database +extras/MonoDevelop.Debugger.Gdb +extras/PyBinding |