]> git.saurik.com Git - cydia.git/log
cydia.git
13 years agoFactor out source discovery.
Grant Paul [Fri, 18 Feb 2011 09:25:29 +0000 (01:25 -0800)] 
Factor out source discovery.

13 years agoUse -[Source key] instead of -[Source name] or -[Source uri].
Grant Paul [Fri, 18 Feb 2011 09:18:37 +0000 (01:18 -0800)] 
Use -[Source key] instead of -[Source name] or -[Source uri].

13 years agoSeriously? Is correcting the typos of repository owners supposed to be a full time...
Grant Paul [Fri, 18 Feb 2011 05:45:06 +0000 (21:45 -0800)] 
Seriously? Is correcting the typos of repository owners supposed to be a full time job?

13 years agoFixed reloading of SourceController by re-mapping the source_ by the Source's uri...
Grant Paul [Fri, 18 Feb 2011 05:29:22 +0000 (21:29 -0800)] 
Fixed reloading of SourceController by re-mapping the source_ by the Source's uri on -reloadData.

13 years agoConsider removal of special packages a reportable error.
Jay Freeman (saurik) [Fri, 18 Feb 2011 06:31:42 +0000 (22:31 -0800)] 
Consider removal of special packages a reportable error.

13 years agoTotally rewrote ConfirmationController JS interface.
Jay Freeman (saurik) [Fri, 18 Feb 2011 01:40:03 +0000 (17:40 -0800)] 
Totally rewrote ConfirmationController JS interface.

13 years agoReload/nil buttons for ConfirmationController were backwards.
Jay Freeman (saurik) [Fri, 18 Feb 2011 01:06:59 +0000 (17:06 -0800)] 
Reload/nil buttons for ConfirmationController were backwards.

13 years agoCancel refresh during confirmation.
Jay Freeman (saurik) [Fri, 18 Feb 2011 01:02:59 +0000 (17:02 -0800)] 
Cancel refresh during confirmation.

13 years agoConfirmationController cancel doesn't work for ReInstall.
Jay Freeman (saurik) [Thu, 17 Feb 2011 14:42:01 +0000 (06:42 -0800)] 
ConfirmationController cancel doesn't work for ReInstall.

13 years agoAdd CydiaScript: a better Objective-C bridge.
Jay Freeman (saurik) [Thu, 17 Feb 2011 14:18:51 +0000 (06:18 -0800)] 
Add CydiaScript: a better Objective-C bridge.

13 years agoRemove extraneous [[self navigationItem] setTitle:] calls.
Jay Freeman (saurik) [Thu, 17 Feb 2011 11:32:47 +0000 (03:32 -0800)] 
Remove extraneous [[self navigationItem] setTitle:] calls.

13 years agoReformatted otherButtonTitles: due to variadic arguments.
Jay Freeman (saurik) [Thu, 17 Feb 2011 11:31:22 +0000 (03:31 -0800)] 
Reformatted otherButtonTitles: due to variadic arguments.

13 years agoRemove pointless IgnoreInstall #define.
Jay Freeman (saurik) [Thu, 17 Feb 2011 10:49:43 +0000 (02:49 -0800)] 
Remove pointless IgnoreInstall #define.

13 years agoUse document.dispatchEvent() for UIViewController events.
Jay Freeman (saurik) [Thu, 17 Feb 2011 09:45:59 +0000 (01:45 -0800)] 
Use document.dispatchEvent() for UIViewController events.

13 years agoUse C++ RAII for WebThreadLock/Unlock().
Jay Freeman (saurik) [Thu, 17 Feb 2011 10:21:12 +0000 (02:21 -0800)] 
Use C++ RAII for WebThreadLock/Unlock().

13 years agoAdd LogMessages and use for console.log.
Jay Freeman (saurik) [Thu, 17 Feb 2011 02:43:35 +0000 (18:43 -0800)] 
Add LogMessages and use for console.log.

13 years agoSupport ShowInternals in more places.
Jay Freeman (saurik) [Thu, 17 Feb 2011 02:42:37 +0000 (18:42 -0800)] 
Support ShowInternals in more places.

13 years agoUpdate Chinese localization. (Credit goes to Merlin Mao.)
Grant Paul [Thu, 17 Feb 2011 01:32:57 +0000 (17:32 -0800)] 
Update Chinese localization. (Credit goes to Merlin Mao.)

13 years agoStart at the homepage if !recently.
Grant Paul [Tue, 15 Feb 2011 02:55:51 +0000 (18:55 -0800)] 
Start at the homepage if !recently.

13 years agoUse name_, not [package_ id], for -[CYPackageController navigationURL].
Jay Freeman (saurik) [Mon, 14 Feb 2011 09:35:19 +0000 (01:35 -0800)] 
Use name_, not [package_ id], for -[CYPackageController navigationURL].

13 years agoImplement chpwn's lazy-loading API for BrowserController.
Jay Freeman (saurik) [Mon, 14 Feb 2011 09:10:41 +0000 (01:10 -0800)] 
Implement chpwn's lazy-loading API for BrowserController.

13 years agoRemove cydia://storage.
Jay Freeman (saurik) [Mon, 14 Feb 2011 09:08:10 +0000 (01:08 -0800)] 
Remove cydia://storage.

13 years agoFix lazy loading of PackageController, dependent on lazy laoding of BrowserController.'
Grant Paul [Mon, 14 Feb 2011 08:40:21 +0000 (00:40 -0800)] 
Fix lazy loading of PackageController, dependent on lazy laoding of BrowserController.'

13 years agoAdded more comments, and removed a useless method.
Grant Paul [Mon, 14 Feb 2011 08:35:49 +0000 (00:35 -0800)] 
Added more comments, and removed a useless method.

13 years agoUse a better URL scheme for /ui/ios*/ *and* (frowny) fix a multiple reload issue...
Jay Freeman (saurik) [Mon, 14 Feb 2011 08:22:23 +0000 (00:22 -0800)] 
Use a better URL scheme for /ui/ios*/ *and* (frowny) fix a multiple reload issue on CYPackageController while breaking lazy loading.

13 years agoLook, I don't like this syntax, but it is what Apple uses and my syntax highlighter...
Jay Freeman (saurik) [Mon, 14 Feb 2011 08:20:42 +0000 (00:20 -0800)] 
Look, I don't like this syntax, but it is what Apple uses and my syntax highlighter prefers it.

13 years agoExplanation.
Grant Paul [Mon, 14 Feb 2011 08:33:54 +0000 (00:33 -0800)] 
Explanation.

13 years agoUpdate iPhonePrivate.h for unselected tab bar changes.
Grant Paul [Mon, 14 Feb 2011 02:50:59 +0000 (18:50 -0800)] 
Update iPhonePrivate.h for unselected tab bar changes.

13 years agoHorrible, awful, ugly, nasty, evil, terrible, scary, screwed up, and despicable hack...
Grant Paul [Sun, 13 Feb 2011 23:25:30 +0000 (15:25 -0800)] 
Horrible, awful, ugly, nasty, evil, terrible, scary, screwed up, and despicable hack to fix the "transientViewController" issues on CYTabBar.

13 years agoFix dpkg --configure -a, half-installed packages, database loading errors, general...
Grant Paul [Sun, 13 Feb 2011 22:53:04 +0000 (14:53 -0800)] 
Fix dpkg --configure -a, half-installed packages, database loading errors, general dpkg errors, broken saved interface states, and a constant-space memory leak of the loading controller.

13 years agoFix "(No Section)" section.
Grant Paul [Sun, 13 Feb 2011 20:50:33 +0000 (12:50 -0800)] 
Fix "(No Section)" section.

13 years agoRename /ui/ to /ui/ios/.
Jay Freeman (saurik) [Sun, 13 Feb 2011 19:45:18 +0000 (11:45 -0800)] 
Rename /ui/ to /ui/ios/.

13 years agoSupport ftruncate error conditions.
Jay Freeman (saurik) [Sun, 13 Feb 2011 05:26:08 +0000 (21:26 -0800)] 
Support ftruncate error conditions.

13 years agoAdd fail-fast error checking to Cytore.
Jay Freeman (saurik) [Sun, 13 Feb 2011 04:39:44 +0000 (20:39 -0800)] 
Add fail-fast error checking to Cytore.

13 years agoRefactor the placard code with background colors.
Jay Freeman (saurik) [Sun, 13 Feb 2011 04:09:34 +0000 (20:09 -0800)] 
Refactor the placard code with background colors.

13 years agoRevert an old Clang change that broke cydia.format().
Jay Freeman (saurik) [Sun, 13 Feb 2011 03:42:42 +0000 (19:42 -0800)] 
Revert an old Clang change that broke cydia.format().

13 years ago-[SectionController initWithDatabase:section:] stored fields outside of self scope.
Jay Freeman (saurik) [Sun, 13 Feb 2011 02:41:47 +0000 (18:41 -0800)] 
-[SectionController initWithDatabase:section:] stored fields outside of self scope.

13 years agoRestart Lowtide/AppleTV after processing AutoInstall.
Jay Freeman (saurik) [Thu, 10 Feb 2011 21:41:25 +0000 (13:41 -0800)] 
Restart Lowtide/AppleTV after processing AutoInstall.

13 years agoRemove obsolete advanced.png graphic.
Jay Freeman (saurik) [Thu, 10 Feb 2011 13:18:42 +0000 (05:18 -0800)] 
Remove obsolete advanced.png graphic.

13 years agoRemove package variable, use cydia.getPackageById().
Jay Freeman (saurik) [Thu, 10 Feb 2011 13:04:42 +0000 (05:04 -0800)] 
Remove package variable, use cydia.getPackageById().

13 years agoReplace unknown.html with /ui/package/#!/name.
Jay Freeman (saurik) [Thu, 10 Feb 2011 12:58:37 +0000 (04:58 -0800)] 
Replace unknown.html with /ui/package/#!/name.

13 years agoRemove obsolete local chevrons.
Jay Freeman (saurik) [Thu, 10 Feb 2011 12:57:50 +0000 (04:57 -0800)] 
Remove obsolete local chevrons.

13 years agoUse HTML5 Offline for confirm.html.
Jay Freeman (saurik) [Thu, 10 Feb 2011 12:44:25 +0000 (04:44 -0800)] 
Use HTML5 Offline for confirm.html.

13 years agoSupport NULL Cytore return in PackageFind().
Jay Freeman (saurik) [Wed, 9 Feb 2011 21:35:07 +0000 (13:35 -0800)] 
Support NULL Cytore return in PackageFind().

13 years agoTo match the built in Apple apps, the Confirm button should be blue (like Send in...
Grant Paul [Sat, 12 Feb 2011 22:45:28 +0000 (14:45 -0800)] 
To match the built in Apple apps, the Confirm button should be blue (like Send in MobileMail, etc).

13 years agoRemove unused (and unnecessary) functions, rename confusingly-named CYActionSheet...
Grant Paul [Sat, 12 Feb 2011 07:35:48 +0000 (23:35 -0800)] 
Remove unused (and unnecessary) functions, rename confusingly-named CYActionSheet->CYAlertView class.

13 years agoMove -init into -loadView -viewDidLoad and friends, as Apple wants. Add -navigationUR...
Grant Paul [Sat, 12 Feb 2011 07:27:43 +0000 (23:27 -0800)] 
Move -init into -loadView -viewDidLoad and friends, as Apple wants. Add -navigationURL and persistance (15 minute timeout) of Cydia sessions, with full lazy-loading of view controllers. Still failed to fix the URL->blackscreen bug, although now it just shows the wrong tab instaed of a black screen (really, WTF, UITabBarController?)

13 years agoFix Sections.plist.
Grant Paul [Fri, 11 Feb 2011 07:28:17 +0000 (23:28 -0800)] 
Fix Sections.plist.

13 years agoMerge branch 'develop-1.2' of git.saurik.com:cydia into develop-1.2
Grant Paul [Fri, 11 Feb 2011 06:16:35 +0000 (22:16 -0800)] 
Merge branch 'develop-1.2' of git.saurik.com:cydia into develop-1.2

13 years agoSeriously? Is it *that hard* to name your sections correctly?
Grant Paul [Fri, 11 Feb 2011 06:16:15 +0000 (22:16 -0800)] 
Seriously? Is it *that hard* to name your sections correctly?

13 years agoFix rotation support in keyboard resizing.
Grant Paul [Thu, 10 Feb 2011 00:56:55 +0000 (16:56 -0800)] 
Fix rotation support in keyboard resizing.

13 years agoProperly resize search view when keyboard is shown. Yes, really, this is the correct...
Grant Paul [Thu, 10 Feb 2011 00:29:49 +0000 (16:29 -0800)] 
Properly resize search view when keyboard is shown. Yes, really, this is the correct way to do this on pre-3.2: I did not make up this insanity.

13 years agoUpdate another copyright date.
Grant Paul [Wed, 9 Feb 2011 21:30:47 +0000 (13:30 -0800)] 
Update another copyright date.

13 years agoRemove [Filtered]PackageTable, replace with equivalent controllers. Get rid of all...
Grant Paul [Wed, 9 Feb 2011 21:17:05 +0000 (13:17 -0800)] 
Remove [Filtered]PackageTable, replace with equivalent controllers. Get rid of all need for FilteredPackageController.

13 years agoWe're living in the future
Ryan Petrich [Wed, 9 Feb 2011 01:39:05 +0000 (18:39 -0700)] 
We're living in the future

13 years agosaurik is busy.
Grant Paul [Wed, 9 Feb 2011 05:51:48 +0000 (21:51 -0800)] 
saurik is busy.

13 years agoFixed slightly corrupted English localization -- but is this string ever used?
Grant Paul [Wed, 9 Feb 2011 05:49:26 +0000 (21:49 -0800)] 
Fixed slightly corrupted English localization -- but is this string ever used?

13 years agoMerge branch 'restructure'
Jay Freeman (saurik) [Tue, 8 Feb 2011 01:01:00 +0000 (17:01 -0800)] 
Merge branch 'restructure'

13 years agoRevert "Move Source{Cell,Controller} lower in MobileCydia.mm."
Jay Freeman (saurik) [Tue, 8 Feb 2011 00:59:21 +0000 (16:59 -0800)] 
Revert "Move Source{Cell,Controller} lower in MobileCydia.mm."

This reverts commit 0603a88527c370a7fce4165335bccf09ab688f3c.

13 years agoOMG HTML5 Offline FTW.
Jay Freeman (saurik) [Tue, 8 Feb 2011 00:19:44 +0000 (16:19 -0800)] 
OMG HTML5 Offline FTW.

13 years agoSupport non-NSHTTPURLResponse https?:// NSURLResponse.
Jay Freeman (saurik) [Tue, 8 Feb 2011 00:21:37 +0000 (16:21 -0800)] 
Support non-NSHTTPURLResponse https?:// NSURLResponse.

13 years agoRemove that crazy/obsolete Test file.
Jay Freeman (saurik) [Mon, 7 Feb 2011 21:30:14 +0000 (13:30 -0800)] 
Remove that crazy/obsolete Test file.

13 years agoWe are no longer recycling package controllers.
Jay Freeman (saurik) [Mon, 7 Feb 2011 20:49:10 +0000 (12:49 -0800)] 
We are no longer recycling package controllers.

13 years agoFix for description searching from humbold.
Jay Freeman (saurik) [Mon, 7 Feb 2011 20:26:58 +0000 (12:26 -0800)] 
Fix for description searching from humbold.

13 years agoWe can't use 3.0 constants on 2.0 SDK.
Jay Freeman (saurik) [Wed, 2 Feb 2011 07:46:05 +0000 (23:46 -0800)] 
We can't use 3.0 constants on 2.0 SDK.

13 years agoUIApplication.applicationSupportsShakeToEdit is 3.0-only.
Jay Freeman (saurik) [Wed, 2 Feb 2011 07:44:23 +0000 (23:44 -0800)] 
UIApplication.applicationSupportsShakeToEdit is 3.0-only.

13 years agoConditional out indexed collation nonsense.
Jay Freeman (saurik) [Wed, 2 Feb 2011 07:44:05 +0000 (23:44 -0800)] 
Conditional out indexed collation nonsense.

13 years agoUse IsWildcat_, not UI_USER_INTERFACE_IDIOM().
Jay Freeman (saurik) [Wed, 2 Feb 2011 07:39:14 +0000 (23:39 -0800)] 
Use IsWildcat_, not UI_USER_INTERFACE_IDIOM().

13 years agoI am perpetually impressed with the abilities of the default repositories to misspell...
Grant Paul [Sat, 5 Feb 2011 09:06:29 +0000 (01:06 -0800)] 
I am perpetually impressed with the abilities of the default repositories to misspell, create, and otherwise mutilate the sections listing. For another small battle in this endless war, I add a mapping from Themes (App Addons) to Themes (Addons), to remove another one-package-only section.

13 years agoFix "fake terminal" in ProgressController extending underneath the close button.
Grant Paul [Sat, 5 Feb 2011 09:00:32 +0000 (01:00 -0800)] 
Fix "fake terminal" in ProgressController extending underneath the close button.

13 years agoAdded session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasi...
Grant Paul [Wed, 2 Feb 2011 08:11:55 +0000 (00:11 -0800)] 
Added session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasing of views in low-memory situations; style changes.

13 years agoAvoid flashing empty package view as it loads the package details.
Grant Paul [Sat, 5 Feb 2011 08:39:15 +0000 (00:39 -0800)] 
Avoid flashing empty package view as it loads the package details.

13 years agoMerge branch 'restructure' into develop-1.2
Grant Paul [Fri, 4 Feb 2011 00:01:35 +0000 (16:01 -0800)] 
Merge branch 'restructure' into develop-1.2

13 years agoMake PackageCell, SourceCell, and SectionCell have reasonable VoiceOver labels.
Grant Paul [Thu, 3 Feb 2011 23:59:51 +0000 (15:59 -0800)] 
Make PackageCell, SourceCell, and SectionCell have reasonable VoiceOver labels.

13 years agoFix VoiceOver (at least on 4.x). Does not cause issues on other firmwares, since...
Grant Paul [Thu, 3 Feb 2011 23:40:19 +0000 (15:40 -0800)] 
Fix VoiceOver (at least on 4.x). Does not cause issues on other firmwares, since if the fix does not work it will just bail out (checks all methods, etc).

13 years agoMerge branch 'develop-1.2' of git.saurik.com:cydia into develop-1.2
Grant Paul [Thu, 3 Feb 2011 22:48:13 +0000 (14:48 -0800)] 
Merge branch 'develop-1.2' of git.saurik.com:cydia into develop-1.2

13 years agoAdded session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasi...
Grant Paul [Wed, 2 Feb 2011 08:11:55 +0000 (00:11 -0800)] 
Added session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasing of views in low-memory situations; style changes.

13 years agoWorkaround to fix the Settings Controller popup on initial launch.
Grant Paul [Wed, 2 Feb 2011 08:30:38 +0000 (00:30 -0800)] 
Workaround to fix the Settings Controller popup on initial launch.

13 years agoAdded session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasi...
Grant Paul [Wed, 2 Feb 2011 08:11:55 +0000 (00:11 -0800)] 
Added session persistence; moved -init to -loadView, -viewDidLoad, etc; added releasing of views in low-memory situations; style changes.

13 years agoRefactor out SourceController; add cydia://source/<case-insensitive-source-name>...
Grant Paul [Wed, 2 Feb 2011 01:57:30 +0000 (17:57 -0800)] 
Refactor out SourceController; add cydia://source/<case-insensitive-source-name> to open it from outside the app.

13 years agoFormatting changes.
Grant Paul [Tue, 1 Feb 2011 22:49:39 +0000 (14:49 -0800)] 
Formatting changes.

13 years agoRefactor edit button in SectionsController; use system provided UIBarButtonItems.
Grant Paul [Tue, 1 Feb 2011 19:00:09 +0000 (11:00 -0800)] 
Refactor edit button in SectionsController; use system provided UIBarButtonItems.

13 years agoRemoved unused "accessory_" ivar of SectionsController.
Grant Paul [Tue, 1 Feb 2011 17:54:00 +0000 (09:54 -0800)] 
Removed unused "accessory_" ivar of SectionsController.

13 years agoFix stupidness introduced by last commit; correctly fix cydia://url/* URLs. make-me-a-sandwich
Grant Paul [Mon, 31 Jan 2011 07:42:16 +0000 (23:42 -0800)] 
Fix stupidness introduced by last commit; correctly fix cydia://url/* URLs.

13 years agoFix cydia://url/ links when they include a slash.
Grant Paul [Mon, 31 Jan 2011 07:31:59 +0000 (23:31 -0800)] 
Fix cydia://url/ links when they include a slash.

13 years agoUpdate section mapping to correctly redirect Themes (Video).
Grant Paul [Sun, 30 Jan 2011 01:32:01 +0000 (17:32 -0800)] 
Update section mapping to correctly redirect Themes (Video).

13 years agoFix refreshing bar on iOS 3.0+ by using the CoreFoundation version to check versionin...
Grant Paul [Sun, 30 Jan 2011 00:28:11 +0000 (16:28 -0800)] 
Fix refreshing bar on iOS 3.0+ by using the CoreFoundation version to check versioning at runtime.

13 years agoFix loading screen rotation.
Grant Paul [Fri, 28 Jan 2011 02:01:03 +0000 (18:01 -0800)] 
Fix loading screen rotation.

13 years agoSmall formatting fixes.
Grant Paul [Fri, 28 Jan 2011 02:00:55 +0000 (18:00 -0800)] 
Small formatting fixes.

13 years agoSanity in rotation handling: centralize in CYViewController, as it should be.
Grant Paul [Fri, 28 Jan 2011 01:44:39 +0000 (17:44 -0800)] 
Sanity in rotation handling: centralize in CYViewController, as it should be.

13 years agoFix a runtime syslog warning from UIKit by using the -tableView:accessoryTypeForRowWi...
Grant Paul [Thu, 27 Jan 2011 03:13:30 +0000 (19:13 -0800)] 
Fix a runtime syslog warning from UIKit by using the -tableView:accessoryTypeForRowWithIndexPath: in SourceController.

13 years agoMake ChangesController more like any other controller, i.e., use -initWithDatabase...
Grant Paul [Thu, 27 Jan 2011 02:44:41 +0000 (18:44 -0800)] 
Make ChangesController more like any other controller, i.e., use -initWithDatabase: and -setDelegate: instead of the unique -initWithDatabase:delegate:.

13 years agoControllers need their delegete set when launched from URLs. Also, use cydia://home...
Grant Paul [Sun, 23 Jan 2011 20:38:17 +0000 (12:38 -0800)] 
Controllers need their delegete set when launched from URLs. Also, use cydia://home when creating the home page, to avoid a *third* duplication of that code. (Setting the selected index to zero is not possible due to UITabBarController changes between 2.x and 3.x+ that make behavior uncertain in that case with regard to calling delegate methods.)

13 years agoFinish cydia:// URLs using the private "transient view controller" methods on UITabBa...
Grant Paul [Sun, 23 Jan 2011 06:35:52 +0000 (22:35 -0800)] 
Finish cydia:// URLs using the private "transient view controller" methods on UITabBarController. This allows for no tab to appear selected when on a page using a cydia:// URL.

13 years agoFix -setPage: to not pop all the other tabs to the root controller.
Grant Paul [Sun, 23 Jan 2011 06:05:04 +0000 (22:05 -0800)] 
Fix -setPage: to not pop all the other tabs to the root controller.

13 years agoFix changes badge on first refresh.
Grant Paul [Sun, 23 Jan 2011 00:57:18 +0000 (16:57 -0800)] 
Fix changes badge on first refresh.

13 years agoMoved code around and deleted duplicated and unused code.
Grant Paul [Sun, 23 Jan 2011 00:31:03 +0000 (16:31 -0800)] 
Moved code around and deleted duplicated and unused code.

 - Moved down SourceCell and SourceController to match master.
 - Moved down InstalledController to be in a sane location.
 - Merged DepSubstrate() in with Confirmation Controller's section to avoid a useless and mis-named section.
 - Removed CY prefix on a number of classes where it does not belong.
 - Changed a few folding markers to have more descriptive and accurate names.
 - Probably more.

13 years agoMerge commit '664d95c4bf793f6206d94a366caf31c90cd9fd00' into tab-backup
Grant Paul [Sun, 23 Jan 2011 00:18:08 +0000 (16:18 -0800)] 
Merge commit '664d95c4bf793f6206d94a366caf31c90cd9fd00' into tab-backup

13 years agoMerge commit 'b48bb27b7d5ffd1dc4e1f002301a633d538cf29e' into tab-backup
Grant Paul [Sun, 23 Jan 2011 00:17:57 +0000 (16:17 -0800)] 
Merge commit 'b48bb27b7d5ffd1dc4e1f002301a633d538cf29e' into tab-backup

13 years agoMerge commit 'f64f9f6255e43c48ba2b8e5cea6a5b23e5d14e26' into tab-backup
Grant Paul [Sun, 23 Jan 2011 00:17:49 +0000 (16:17 -0800)] 
Merge commit 'f64f9f6255e43c48ba2b8e5cea6a5b23e5d14e26' into tab-backup