Merge branch 'develop'

devxoul · Aug 3, 2014 · 39ee5a5 · 39ee5a5
2 parents 25925bf + 0d2a6ef
commit 39ee5a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Allkdic/Allkdic-Info.plist b/Allkdic/Allkdic-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>357</string>
+	<string>358</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Allkdic/AppDelegate.m b/Allkdic/AppDelegate.m
@@ -21,7 +21,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 
 	self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
 
-	NSImage *icon = [NSImage imageNamed:@"statusicon_default.png"];
+	NSImage *icon = [NSImage imageNamed:@"statusicon_default"];
 	icon.template = YES;
 	self.statusItem.image = icon;
 

diff --git a/Resources/[email protected] b/Resources/[email protected]