about summary refs log tree commit diff
path: root/scripts/make_release.py
diff options
context:
space:
mode:
authorTeetime <TeetimeTW@yahoo.de>2012-03-07 00:05:12 +0100
committerTeetime <TeetimeTW@yahoo.de>2012-03-07 00:05:12 +0100
commit66c44fc229bf8f2f029985a3d712c2518e4e38a9 (patch)
tree9b35dee344f877709bcb050bd7b0ad55e25da081 /scripts/make_release.py
parent44a47d4253a829abcf50dac5586fd9a351f0c66b (diff)
parenta42603ba43720b51ba8909d352fc2af88ebba2dd (diff)
downloadzcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.tar.gz
zcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.zip
Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2
Conflicts:
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config_variables.h
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp
Diffstat (limited to 'scripts/make_release.py')
-rw-r--r--scripts/make_release.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/make_release.py b/scripts/make_release.py
index c0cbb152..80cbd35b 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -110,6 +110,7 @@ print("adding files")
 shutil.copy("readme.txt", package_dir)
 shutil.copy("license.txt", package_dir)
 shutil.copy("storage.cfg", package_dir)
+shutil.copy("banmasters.cfg", package_dir)
 
 if include_data and not use_bundle:
 	os.mkdir(os.path.join(package_dir, "data"))