Merge branch 'master' of github.com:libretro/RetroArch

This commit is contained in:
fr500 2015-04-19 14:26:52 -05:00
commit c0198ac391

View File

@ -984,14 +984,6 @@
</object>
<int key="connectionID">552</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">coreWasChosen:</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="59737118"/>
</object>
<int key="connectionID">580</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showPreferences:</string>
@ -1008,14 +1000,6 @@
</object>
<int key="connectionID">588</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">coreSelectSheet</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="361653618"/>
</object>
<int key="connectionID">590</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">window</string>