Permalink
Browse files

Merge branch 'hotfix/sparkle_github'

  • Loading branch information...
2 parents 9937c5f + 3d8b12e commit 196d7a1658bdddc19b7597b42bad72992be49f13 @osigge committed Sep 11, 2012
@@ -10,7 +10,6 @@
280E9EBD15E0D18C00530934 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 280E9EBC15E0D18C00530934 /* QuartzCore.framework */; };
2841C7E115C91CC100F4F15F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2841C7E015C91CC100F4F15F /* Cocoa.framework */; };
2841C7ED15C91CC100F4F15F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2841C7EC15C91CC100F4F15F /* main.m */; };
- 2841C7F115C91CC100F4F15F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2841C7EF15C91CC100F4F15F /* Credits.rtf */; };
2841C7F415C91CC100F4F15F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2841C7F315C91CC100F4F15F /* AppDelegate.m */; };
2841C7FE15C91CEF00F4F15F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2841C7FD15C91CEF00F4F15F /* IOKit.framework */; };
28833BB215D7D4FF00741727 /* Readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 28833BB115D7D4FF00741727 /* Readme.md */; };
@@ -139,7 +138,6 @@
2841C7E815C91CC100F4F15F /* Battery Time Remaining-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Battery Time Remaining-Info.plist"; sourceTree = "<group>"; };
2841C7EC15C91CC100F4F15F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2841C7EE15C91CC100F4F15F /* Battery Time Remaining-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Battery Time Remaining-Prefix.pch"; sourceTree = "<group>"; };
- 2841C7F015C91CC100F4F15F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
2841C7F215C91CC100F4F15F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
2841C7F315C91CC100F4F15F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
2841C7FD15C91CEF00F4F15F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
@@ -153,7 +151,6 @@
28FEDA6215DA5EB200320B72 /* LLManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LLManager.h; path = ../LaunchAtLoginHelper/LLManager.h; sourceTree = "<group>"; };
28FEDA6315DA5EB200320B72 /* LLManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = LLManager.m; path = ../LaunchAtLoginHelper/LLManager.m; sourceTree = "<group>"; };
28FEDA6415DA5EB200320B72 /* LLStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LLStrings.h; path = ../LaunchAtLoginHelper/LLStrings.h; sourceTree = "<group>"; };
- B5415C9A15FEA60B0021C0A9 /* release-notes */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "release-notes"; sourceTree = "<group>"; };
B5BA41EA15FB87F0005082D7 /* MainMenuViewControllerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuViewControllerTest.h; sourceTree = "<group>"; };
B5BA41EB15FB87F0005082D7 /* MainMenuViewControllerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuViewControllerTest.m; sourceTree = "<group>"; };
B5BA41ED15FB8A50005082D7 /* PowerSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PowerSource.h; sourceTree = "<group>"; };
@@ -253,7 +250,6 @@
2841C7D115C91CC100F4F15F = {
isa = PBXGroup;
children = (
- B5415C9A15FEA60B0021C0A9 /* release-notes */,
B5BA421915FB9C8C005082D7 /* Libraries and Helpers */,
2841C7E615C91CC100F4F15F /* Battery Time Remaining */,
B5C45B9515F94BDA00EEAD4D /* Battery Time Remaining Tests */,
@@ -325,7 +321,6 @@
2841C7E815C91CC100F4F15F /* Battery Time Remaining-Info.plist */,
2841C7EC15C91CC100F4F15F /* main.m */,
2841C7EE15C91CC100F4F15F /* Battery Time Remaining-Prefix.pch */,
- 2841C7EF15C91CC100F4F15F /* Credits.rtf */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -558,7 +553,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 2841C7F115C91CC100F4F15F /* Credits.rtf in Resources */,
28BA61A815D1B12500EDB674 /* icon.icns in Resources */,
28833BB215D7D4FF00741727 /* Readme.md in Resources */,
D53375E515DC43380077CEF6 /* Localizable.strings in Resources */,
@@ -675,14 +669,6 @@
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
- 2841C7EF15C91CC100F4F15F /* Credits.rtf */ = {
- isa = PBXVariantGroup;
- children = (
- 2841C7F015C91CC100F4F15F /* en */,
- );
- name = Credits.rtf;
- sourceTree = "<group>";
- };
B5C45B9815F94BDA00EEAD4D /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.6</string>
+ <string>1.6.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -1,10 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\vieww9600\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
-
-\f0\b\fs24 \cf0 Engineering:
-\b0 \
- Han Lin Yap\
- Mathijs Kadijk }
View
@@ -1,17 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <channel>
- <title>Battery Time Remaining</title>
- <link>https://raw.github.com/osigge/Battery-Time-Remaining/master/appcast.xml</link>
- <description>Most recent changes with links to updates.</description>
- <language>en</language>
- <item>
+ <channel>
+ <title>Battery Time Remaining</title>
+ <link>https://raw.github.com/osigge/Battery-Time-Remaining/master/appcast.xml</link>
+ <description>Show the estimated battery time remaining on top of your screen in Mac OS X 10.8 Mountain Lion.</description>
+ <language>en</language>
+ <item>
+ <title>Version 1.6.1</title>
+ <sparkle:minimumSystemVersion>10.8</sparkle:minimumSystemVersion>
+ <description><![CDATA[
+ <h3><span style="font-weight:bold;">New in version 1.6.1</span></h3>
+ <ul>
+ <li>Integrated Sparkle</li>
+ </ul>
+ ]]>
+ </description>
+ <pubDate>Wed, 12 Sep 2012 01:15:00 +0000</pubDate>
+ <enclosure url="https://github.com/downloads/osigge/Battery-Time-Remaining/Battery Time Remaining-1.6.1.zip" sparkle:shortVersionString="1.6.1" sparkle:version="1.6.1" length="697540" type="application/octet-stream" sparkle:dsaSignature="MCwCFC76QiwZ7js/vp9SQMzXzJNdYWGCAhQf9uK57BGCMPjlQ1jTF6RJwAX2vA==" />
+ </item>
+ <item>
<title>Version 1.6</title>
- <sparkle:releaseNotesLink>
- https://github.com/osigge/Battery-Time-Remaining/wiki/Version-1.6
- </sparkle:releaseNotesLink>
+ <sparkle:minimumSystemVersion>10.8</sparkle:minimumSystemVersion>
+ <description><![CDATA[
+ <h3><span style="font-weight:bold;">New in version 1.6</span></h3>
+ <ul>
+ <li>The additional info of the advanced mode is displayed on option + click</li>
+ <li>Remaining time is now always in parenthesis</li>
+ <li>Sparkle integration</li>
+ <li>Major refactorings and rewrites</li>
+ </ul>
+ ]]>
+ </description>
<pubDate>Wed, 11 Sep 2012 01:15:00 +0000</pubDate>
- <enclosure url="https://github.com/downloads/osigge/Battery-Time-Remaining/Battery%20Time%20Remaining-1.6.zip" sparkle:version="1.6" length="1623481" type="application/octet-stream" sparkle:dsaSignature="MCwCFDkR4oCBfdpE3VdBqAJH4fn4aFZ9AhQ0IVQMCuaXUJ6CerGgAkQcK32drg==" />
- </item>
- </channel>
+ <enclosure url="https://github.com/downloads/osigge/Battery-Time-Remaining/Battery Time Remaining-1.6.zip" sparkle:shortVersionString="1.6" sparkle:version="1.6" length="697540" type="application/octet-stream" sparkle:dsaSignature="MCwCFDkR4oCBfdpE3VdBqAJH4fn4aFZ9AhQ0IVQMCuaXUJ6CerGgAkQcK32drg==" />
+ </item>
+ </channel>
</rss>
@@ -1,6 +0,0 @@
-2012-09-11 - **v1.6**
-
-* Die Zusatzinformationen des erweiterten Modus können nun per ALT + Klick angezeigt werden
-* Die verbleibende Zeit ist nun immer eingeklammert
-* Sparkle integriert
-* Viele Refactorings und Rewrites
@@ -1,6 +0,0 @@
-2012-09-11 - **v1.6**
-
-* The additional info of the advanced mode is displayed on option + click
-* Remaining time is now always in paranthesis
-* Sparkle integration
-* Major refactorings and rewrites

0 comments on commit 196d7a1

Please sign in to comment.