Merge remote branch 'origin/about' into about

Conflicts:
	SparkleShare/SparkleAbout.cs
This commit is contained in:
Hylke Bons 2011-04-17 13:35:25 +01:00
commit 99cbfb43a5

View file

@ -55,10 +55,8 @@ namespace SparkleShare {
SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) {
Application.Invoke (delegate {
Version.Markup = "<small><span fgcolor='#f57900'>A newer version (" + new_version + ") is available!</span></small>";
Version.ShowAll ();
});
};
@ -97,6 +95,7 @@ namespace SparkleShare {
box.Add (header);
Version = new Label () {
Markup = "<small>Checking for updates...</small>",
Xalign = 0,