Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'master' of https://github.com/sequelpro/sequelpro
- Loading branch information
Showing
with
490 additions
and 306 deletions.
- +24 −20 Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj
- +14 −2 Frameworks/PostgresKit/PostgresKit.xcodeproj/xcshareddata/xcschemes/PostgresKit.xcscheme
- +1 −1 Frameworks/PostgresKit/Resources/Info.plist
- +1 −1 Frameworks/PostgresKit/Resources/Tests-Info.plist
- +1 −1 Frameworks/PostgresKit/Tests/PGDataTypeTests.h
- +6 −6 Frameworks/PostgresKit/Tests/PGDataTypeTests.m
- +2 −2 Frameworks/PostgresKit/Tests/PGPostgresIntegrationTestCase.h
- +15 −1 Frameworks/PostgresKit/Tests/PGPostgresIntegrationTestCase.m
- +1 −1 Frameworks/PostgresKit/Tests/PGPostgresResultTests.h
- +2 −2 Frameworks/PostgresKit/Tests/PGPostgresResultTests.m
- +27 −23 Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
- +14 −2 Frameworks/QueryKit/QueryKit.xcodeproj/xcshareddata/xcschemes/QueryKit.xcscheme
- +1 −1 Frameworks/QueryKit/Resources/Info.plist
- +1 −1 Frameworks/QueryKit/Resources/Tests-Info.plist
- +2 −2 Frameworks/QueryKit/Tests/QKDeleteQueryTests.h
- +8 −8 Frameworks/QueryKit/Tests/QKDeleteQueryTests.m
- +12 −12 Frameworks/QueryKit/Tests/QKQueryTests.m
- +2 −2 Frameworks/QueryKit/Tests/QKSelectQueryGroupByTests.h
- +6 −6 Frameworks/QueryKit/Tests/QKSelectQueryGroupByTests.m
- +2 −2 Frameworks/QueryKit/Tests/QKSelectQueryOrderByTests.h
- +8 −8 Frameworks/QueryKit/Tests/QKSelectQueryOrderByTests.m
- +2 −2 Frameworks/QueryKit/Tests/QKSelectQueryTests.h
- +8 −8 Frameworks/QueryKit/Tests/QKSelectQueryTests.m
- +2 −2 Frameworks/QueryKit/Tests/QKTestCase.h
- +2 −2 Frameworks/QueryKit/Tests/QKUpdateQueryTests.h
- +7 −7 Frameworks/QueryKit/Tests/QKUpdateQueryTests.m
- +1 −1 Frameworks/SPMySQLFramework/Resources/Info.plist
- +1 −1 Frameworks/SPMySQLFramework/SPMySQL Unit Tests/Info.plist
- +10 −1 Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
- +99 −0 ...rks/SPMySQLFramework/SPMySQLFramework.xcodeproj/xcshareddata/xcschemes/SPMySQL.framework.xcscheme
- +1 −1 Interfaces/English.lproj/ConnectionView.xib
- +1 −1 Interfaces/English.lproj/Preferences.xib
- BIN Resources/English.lproj/ConnectionView.strings
- +1 −1 Resources/Plists/Info.plist
- +6 −0 Scripts/package-application.sh
- +3 −3 Source/SPComboPopupButton.m
- +1 −1 Source/SPFileHandle.m
- +36 −35 Source/SPObjectAdditions.m
- +35 −35 UnitTests/SPDataAdditionsTests.m
- +5 −5 UnitTests/SPDatabaseActionTest.m
- +3 −3 UnitTests/SPMenuAdditionsTests.m
- +3 −3 UnitTests/SPMutableArrayAdditionsTests.m
- +11 −11 UnitTests/SPParserUtilsTest.m
- +32 −32 UnitTests/SPStringAdditionsTests.m
- +4 −3 UnitTests/SPTableCopyTest.m
- +5 −5 UnitTests/SPTableFilterParserTest.m
- +41 −32 sequel-pro.xcodeproj/project.pbxproj
- +8 −3 sequel-pro.xcodeproj/xcshareddata/xcschemes/Sequel Pro (10.6 SDK).xcscheme
- +4 −1 sequel-pro.xcodeproj/xcshareddata/xcschemes/Sequel Pro Release Build (10.6+).xcscheme
- +8 −3 sequel-pro.xcodeproj/xcshareddata/xcschemes/Sequel Pro.xcscheme
Oops, something went wrong.