Merged changes from 1.7 branch.
authorScott Ehlert <ds@alliedmods.net>
Sun Dec 07 23:51:58 2008 -0600 (2008-12-07)
changeset 62529f215bc23a0
parent 622 27f7167a5a99
parent 624 285cbde439c0
child 632 86c612397e90
Merged changes from 1.7 branch.
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/.hgignore	Sun Dec 07 23:51:58 2008 -0600
     1.3 @@ -0,0 +1,14 @@
     1.4 +# Binaries
     1.5 +\.dll$
     1.6 +\.exe$
     1.7 +\.so$
     1.8 +
     1.9 +# Files generated by Visual Studio
    1.10 +\.aps$
    1.11 +\.ncb$
    1.12 +\.suo$
    1.13 +\.user$
    1.14 +
    1.15 +# Build directories
    1.16 +/Debug.*
    1.17 +/Release.*
     2.1 --- a/core/Makefile	Wed Nov 26 08:48:14 2008 -0600
     2.2 +++ b/core/Makefile	Sun Dec 07 23:51:58 2008 -0600
     2.3 @@ -102,7 +102,7 @@
     2.4  	$(MAKE) -f Makefile metamod
     2.5  
     2.6  check:
     2.7 -	if [ "$(ENGSET)" == "false" ]; then \
     2.8 +	if [ "$(ENGSET)" = "false" ]; then \
     2.9  		echo "You must supply ENGINE=left4dead or ENGINE=orangebox"; \
    2.10  		exit 1; \
    2.11  	fi
     3.1 --- a/sample_mm/Makefile	Wed Nov 26 08:48:14 2008 -0600
     3.2 +++ b/sample_mm/Makefile	Sun Dec 07 23:51:58 2008 -0600
     3.3 @@ -103,7 +103,7 @@
     3.4  	$(MAKE) -f Makefile sample_mm
     3.5  	
     3.6  check:
     3.7 -	if [ "$(ENGSET)" == "false" ]; then \
     3.8 +	if [ "$(ENGSET)" = "false" ]; then \
     3.9  		echo "You must supply ENGINE=left4dead or ENGINE=orangebox or ENGINE=original"; \
    3.10  		exit 1; \
    3.11  	fi
     4.1 --- a/stub_mm/Makefile	Wed Nov 26 08:48:14 2008 -0600
     4.2 +++ b/stub_mm/Makefile	Sun Dec 07 23:51:58 2008 -0600
     4.3 @@ -103,7 +103,7 @@
     4.4  	$(MAKE) -f Makefile stub_mm
     4.5  	
     4.6  check:
     4.7 -	if [ "$(ENGSET)" == "false" ]; then \
     4.8 +	if [ "$(ENGSET)" = "false" ]; then \
     4.9  		echo "You must supply ENGINE=left4dead or ENGINE=orangebox or ENGINE=original"; \
    4.10  		exit 1; \
    4.11  	fi