Merge branch 'master' into staging

1 files changed, 2 insertions, 2 deletions

diff --git a/cscript b/cscript
index eac0fb089..2e09d2bcd 100644
--- a/cscript
+++ b/cscript
@@ -1,8 +1,8 @@
 import glob
 
-releases = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64']
+release_targets = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64']
 
-def release(environment, variant, version):
+def build_release(environment, variant, version):
     if environment == 'windows':
         command('./waf configure --target-windows')
         command('./waf clean')