Merge from trunk.

Subversion-branch: /branches/strife-branch
Subversion-revision: 1849

8 files changed, 70 insertions, 0 deletions

diff --git a/pkg/osx/Resources/128x128.png b/pkg/osx/Resources/128x128.png
new file mode 100644
index 00000000..0ef1fe9c
--- /dev/null
+++ b/pkg/osx/Resources/128x128.png
diff --git a/pkg/osx/Resources/app.icns b/pkg/osx/Resources/app.icns
new file mode 100644
index 00000000..9b535a25
--- /dev/null
+++ b/pkg/osx/Resources/app.icns
diff --git a/pkg/osx/Resources/app.png b/pkg/osx/Resources/app.png
new file mode 100644
index 00000000..5b932e8c
--- /dev/null
+++ b/pkg/osx/Resources/app.png
diff --git a/pkg/osx/Resources/launcher.nib/classes.nib b/pkg/osx/Resources/launcher.nib/classes.nib
new file mode 100644
index 00000000..7efc837a
--- /dev/null
+++ b/pkg/osx/Resources/launcher.nib/classes.nib
@@ -0,0 +1,47 @@
+{
+    IBClasses = (
+        {
+            CLASS = AppController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {launcherManager = id; }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {closeConfigWindow = id; openConfigWindow = id; }; 
+            CLASS = IWADController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                chex = id; 
+                configWindow = id; 
+                doom1 = id; 
+                doom2 = id; 
+                iwadSelector = id; 
+                plutonia = id; 
+                tnt = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {setButtonClicked = id; }; 
+            CLASS = IWADLocation; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {locationConfigBox = id; }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {launch = id; openTerminal = id; runSetup = id; }; 
+            CLASS = LauncherManager; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                commandLineArguments = id; 
+                iwadController = id; 
+                launchButton = id; 
+                launcherWindow = id; 
+                packageLabel = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/pkg/osx/Resources/launcher.nib/info.nib b/pkg/osx/Resources/launcher.nib/info.nib
new file mode 100644
index 00000000..512ee6dd
--- /dev/null
+++ b/pkg/osx/Resources/launcher.nib/info.nib
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>325 73 612 260 0 0 1440 878 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>29</key>
+		<string>221 322 205 44 0 0 1440 878 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>446.1</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+		<integer>21</integer>
+		<integer>227</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8S2167</string>
+</dict>
+</plist>
diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib
new file mode 100644
index 00000000..cc763056
--- /dev/null
+++ b/pkg/osx/Resources/launcher.nib/keyedobjects.nib
diff --git a/pkg/osx/Resources/wadfile.icns b/pkg/osx/Resources/wadfile.icns
new file mode 100644
index 00000000..13502a55
--- /dev/null
+++ b/pkg/osx/Resources/wadfile.icns
diff --git a/pkg/osx/Resources/wadfile.png b/pkg/osx/Resources/wadfile.png
new file mode 100644
index 00000000..394a3e33
--- /dev/null
+++ b/pkg/osx/Resources/wadfile.png