From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 6 Apr 2012 20:34:34 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~6
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=892fcaf291cb9fc0f9efd4244f01b6b6529409ba

Merge branch '0.5.0.x' into 0.5.x

Conflicts:
	src/qt/notificator.h
---

892fcaf291cb9fc0f9efd4244f01b6b6529409ba
diff --cc src/qt/notificator.h
index 2d83013,dba39f3..0271c26
--- a/src/qt/notificator.h
+++ b/src/qt/notificator.h
@@@ -46,10 -45,11 +46,11 @@@ public slots
  private:
      QWidget *parent;
      enum Mode {
 -        None,
 -        Freedesktop, // Use DBus org.freedesktop.Notifications
 -        QSystemTray, // Use QSystemTray::showMessage
 -        Growl12, // Use the Growl 1.2 notification system (Mac only)
 -        Growl13 // Use the Growl 1.3 notification system (Mac only)
 +        None,        /**< Ignore informational notifications, and show a modal pop-up dialog for Critical notifications. */
 +        Freedesktop, /**< Use DBus org.freedesktop.Notifications */
 +        QSystemTray, /**< Use QSystemTray::showMessage */
-         Growl        /**< Use the Growl notification system (Mac only) */
++        Growl12,        /**< Use the Growl 1.2 notification system (Mac only) */
++        Growl13        /**< Use the Growl 1.3 notification system (Mac only) */
      };
      QString programName;
      Mode mode;