Merge branch 'master' into statusBarAlerts

alon-sht · Apr 10, 2011 · ec6a6e3 · ec6a6e3
2 parents fcbba03 + 2b6aa6d
commit ec6a6e3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/MNAlertDashboardViewController.m b/MNAlertDashboardViewController.m
@@ -256,11 +256,11 @@ -(void)showDashboard
 -(void)clearDashboardPushed:(id)sender
 {
     //Let's create a UIActionSheet to deal with this very destructive action
-    clearActionSheet = [[UIActionSheet alloc] initWithTitle:@""
-                                                             delegate:self 
-                                                    cancelButtonTitle:@"Cancel" 
-                                               destructiveButtonTitle:@"Clear pending?" 
-                                                    otherButtonTitles:nil];
+    clearActionSheet = [[UIActionSheet alloc] initWithTitle:@"Clear pending alerts?"
+                                                   delegate:self 
+                                          cancelButtonTitle:@"Cancel" 
+                                     destructiveButtonTitle:@"Clear pending" 
+                                          otherButtonTitles:nil];
 
     // Temporarily reposition window and elements
     // to cover up the application switcher drawer

diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+MODULES=congruence
 include $(THEOS)/makefiles/common.mk
 
 TWEAK_NAME = MobileNotifier

diff --git a/Readme.md b/Readme.md
@@ -117,4 +117,4 @@ Jay Freeman - saurik.com - for MobileSubstrate, Cydia, Cycript, Veency and count
 
 Kyle Adams - kyleadams.org - for his work on the user interface for the project and prerelease testing
 
-Tim Novinger - timnovinger.com
+Tim Novinger - timnovinger.com - for his work on modernizing animations, cleaning up the interface and tons of other improvements
diff --git a/layout/Library/.DS_Store b/layout/Library/.DS_Store
diff --git a/layout/Library/Application Support/.DS_Store b/layout/Library/Application Support/.DS_Store
diff --git a/layout/Library/Application Support/MobileNotifier/alert_bg_small.png b/layout/Library/Application Support/MobileNotifier/alert_bg_small.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -117,4 +117,4 @@ Jay Freeman - saurik.com - for MobileSubstrate, Cydia, Cycript, Veency and count

		Kyle Adams - kyleadams.org - for his work on the user interface for the project and prerelease testing

		Tim Novinger - timnovinger.com
		Tim Novinger - timnovinger.com - for his work on modernizing animations, cleaning up the interface and tons of other improvements