Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled

temporarily until the netgame changes on raven-branch are finished.

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

1 files changed, 0 insertions, 47 deletions

diff --git a/pkg/osx/Resources/launcher.nib/classes.nib b/pkg/osx/Resources/launcher.nib/classes.nib
deleted file mode 100644
index 7efc837a..00000000
--- a/pkg/osx/Resources/launcher.nib/classes.nib
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    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