Permalink
Browse files

Merge pull request #40 from jwilling/master

Fix hard-coded paths, ignore dirty submodules, show search window on all spaces.
  • Loading branch information...
indragiek committed Sep 18, 2012
2 parents 561f87a + c0bcc18 commit f0c0fe02a2a3d81c4d3647d8dd13bc1e75901952
Showing with 6 additions and 4 deletions.
  1. +2 −0 .gitmodules
  2. +1 −1 Sonora.xcodeproj/project.pbxproj
  3. +3 −3 Sonora/en.lproj/SNRSearchWindowController.xib
View
@@ -1,9 +1,11 @@
[submodule "External/SFBAudioEngine"]
path = External/SFBAudioEngine
url = git://github.com/sonoramac/SFBAudioEngine.git
+ ignore = dirty
[submodule "External/SNRHUDKit"]
path = External/SNRHUDKit
url = git://github.com/sonoramac/SNRHUDKit.git
+ ignore = dirty
[submodule "External/Sparkle"]
path = External/Sparkle
url = git://github.com/sonoramac/Sparkle.git
@@ -2024,7 +2024,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/local/bin/mogenerator -m \"$SRCROOT/Sonora/Sonora.xcdatamodeld/Sonora.xcdatamodel\" --base-class SNRManagedObject --template-var arc=true -O \"$SRCROOT/Sonora/Classes\"";
+ shellScript = "mogenerator -m \"$SRCROOT/Sonora/Sonora.xcdatamodeld/Sonora.xcdatamodel\" --base-class SNRManagedObject --template-var arc=true -O \"$SRCROOT/Sonora/Classes\"";
};
3FE029B3DD9F48468A007F2F /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12B19</string>
- <string key="IBDocument.InterfaceBuilderVersion">2829</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2829</string>
+ <string key="NS.object.0">2840</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -249,7 +249,6 @@
<string key="NSFrame">{{1, 119}, {223, 11}}</string>
<reference key="NSSuperview" ref="613339851"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:1216</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
@@ -291,6 +290,7 @@
<string key="NSMinSize">{457, 292}</string>
<string key="NSMaxSize">{457, 292}</string>
<string key="NSFrameAutosaveName"/>
+ <int key="NSWindowCollectionBehavior">1</int>
<bool key="NSWindowIsRestorable">NO</bool>
</object>
<object class="NSMenu" id="546031182">

0 comments on commit f0c0fe0

Please sign in to comment.