Skip to content

Commit

Permalink
Merge branch 'release/1.0a12'
Browse files Browse the repository at this point in the history
  • Loading branch information
@griff
griff committed Nov 6, 2012
2 parents 96cc1ea + 6e92baf commit 3d15eff
Show file tree
Hide file tree
Showing 93 changed files with 2,722 additions and 1,887 deletions.
58 changes: 23 additions & 35 deletions App/English.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="106"/>
<integer value="501"/>
<integer value="1798"/>
<integer value="1723"/>
<integer value="1833"/>
<integer value="1798"/>
<integer value="106"/>
<integer value="475"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -5783,6 +5783,7 @@
<bool key="NSSelectsInsertedObjects">YES</bool>
<bool key="NSFilterRestrictsInsertion">YES</bool>
<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
<bool key="NSAutomaticallyRearrangesObjects">YES</bool>
</object>
<object class="NSCustomObject" id="488851568">
<string key="NSClassName">FilesUndoController</string>
Expand Down Expand Up @@ -8508,14 +8509,6 @@
</object>
<int key="connectionID">1729</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchController</string>
<reference key="source" ref="184141390"/>
<reference key="destination" ref="4392112"/>
</object>
<int key="connectionID">1730</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">retryButton</string>
Expand Down Expand Up @@ -13459,6 +13452,7 @@
<string>780.IBPluginDependency</string>
<string>781.IBPluginDependency</string>
<string>800.IBPluginDependency</string>
<string>805.CustomClassName</string>
<string>805.IBPluginDependency</string>
<string>81.IBEditorWindowLastContentRect</string>
<string>81.IBPluginDependency</string>
Expand Down Expand Up @@ -13835,7 +13829,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>SearchTableView</string>
<string>UndoTableView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -14090,6 +14084,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>MZArrayController</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{520, 696}, {148, 93}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -14749,6 +14744,14 @@
<string key="minorKey">App/src/GenreDataSource.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MZArrayController</string>
<string key="superclassName">NSArrayController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">App/src/MZArrayController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MZMetaLoader</string>
<string key="superclassName">NSObject</string>
Expand Down Expand Up @@ -14853,6 +14856,13 @@
<string key="minorKey">App/src/MetaZApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="256503224">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">App/src/UndoTableView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down Expand Up @@ -15346,32 +15356,10 @@
<string key="minorKey">App/src/ResizeController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SearchTableView</string>
<string key="superclassName">UndoTableView</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">searchController</string>
<string key="NS.object.0">NSArrayController</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">searchController</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">searchController</string>
<string key="candidateClassName">NSArrayController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">App/src/SearchTableView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UndoTableView</string>
<string key="superclassName">NSTableView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">App/src/UndoTableView.h</string>
</object>
<reference key="sourceIdentifier" ref="256503224"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
Expand Down
Loading

0 comments on commit 3d15eff

Please sign in to comment.