Skip to content

Commit 05407e7

Browse files
committed
Merge branch 'master' of https://github.com/sequelpro/sequelpro
2 parents c7fc016 + 5f54e31 commit 05407e7

30 files changed

+11345
-93197
lines changed

Interfaces/English.lproj/AboutPanel.xib

Lines changed: 160 additions & 1067 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/BundleEditor.xib

Lines changed: 850 additions & 4852 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/BundleHTMLOutput.xib

Lines changed: 47 additions & 297 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/ConnectionErrorDialog.xib

Lines changed: 89 additions & 429 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/Console.xib

Lines changed: 292 additions & 1621 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/ContentFilterManager.xib

Lines changed: 421 additions & 6010 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/ContentPaginationView.xib

Lines changed: 166 additions & 4423 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/DBView.xib

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15E39d" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
6-
<plugIn identifier="com.apple.WebKitIBPlugin" version="10116"/>
7-
<capability name="box content view" minToolsVersion="7.0"/>
5+
<development version="5100" identifier="xcode"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
7+
<plugIn identifier="com.apple.WebKitIBPlugin" version="9532"/>
88
</dependencies>
99
<objects>
1010
<customObject id="-2" userLabel="File's Owner" customClass="SPDatabaseDocument">
@@ -1018,7 +1018,7 @@
10181018
</subviews>
10191019
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
10201020
</clipView>
1021-
<scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="3922">
1021+
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3922">
10221022
<rect key="frame" x="1" y="142" width="690" height="16"/>
10231023
<autoresizingMask key="autoresizingMask"/>
10241024
</scroller>

Interfaces/English.lproj/DataMigrationDialog.xib

Lines changed: 952 additions & 8669 deletions
Large diffs are not rendered by default.

Interfaces/English.lproj/DatabaseProcessList.xib

Lines changed: 444 additions & 2282 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)