From 21f01878952cc00becda76be845efd3caa302a3e Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sun, 17 Sep 2006 10:41:10 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@396 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/autoexec.cfg | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/config/autoexec.cfg b/config/autoexec.cfg
index 85e85188..1cfc1ef8 100755
--- a/config/autoexec.cfg
+++ b/config/autoexec.cfg
@@ -75,11 +75,8 @@ bind 4 grenade
 bind R reload
 
 
-//bind MOUSE2 [ altattack ]
-bind mouse2 [ altattack;onrelease [ altattack ] ] 
+bind mouse2 [ altattack ] 
 
-=======
->>>>>>> 1.15
 alias delta_edit_0 [ editheight $flrceil $arg1 ]
 alias delta_edit_1 [ if $flrceil [ vdelta $arg1 ] [ vdelta (- 0 $arg1) ] ]
 alias delta_edit_2 [ edittex $flrceil $arg1 ]
@@ -87,12 +84,6 @@ alias delta_edit_3 [ edittex (+ $flrceil 1) $arg1 ]
 alias delta_edit_4 [ equalize $flrceil ]
 alias delta_edit_5 [ entproperty 0 $arg1 ]  // and the others
 
-alias delta_game_0 [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ]
-
-
-
-if (only_menu_music) [ musicvol 1; music $menu_music ]
-
 // change
 hudgun 1
 
@@ -111,9 +102,6 @@ alias ffa   [ mode 2; map $arg1 ]
 alias lms   [ mode 3; map $arg1 ]
 
 
-
-=======
-
 music ac.ogg
 musicvol $maxmusicvol
 
@@ -134,4 +122,4 @@ alias start_intermission [
 ]
 
 // play once (1:40)
-sleep 100000 [ fade 1 ]>>>>>>> 1.15
+sleep 100000 [ fade 1 ]