Fixed merge conflicts in imported patch.

This commit is contained in:
Richard Helgeby 2009-12-26 21:36:50 +01:00
parent cd5b1dc815
commit 5e3546154a

View File

@ -1,18 +1,23 @@
#!/bin/sh #!/bin/sh
RELEASEDIR=release
BUILDDIR=build
VERSION="zombiereloaded-3.0-b2" VERSION="zombiereloaded-3.0-b2"
REVISION=$(hg id -n) REVISION=$(hg id -n)
ZIPFILE=$VERSION-r$REVISION.zip
# Source paths
PLUGINFILES="cstrike/*" BUILDDIR=build
DOCS="docs/*" PLUGINFILE=zombiereloaded.smx
DOCS_DEST=$RELEASEDIR/zrdocs PLUGINFILES="cstrike/*"
PLUGINFILE=zombiereloaded.smx ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools
PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins DOCS="docs/*"
ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools SOURCEDIR="src/*"
# Destination paths
RELEASEDIR=release
SOURCE_DEST=$RELEASEDIR/addons/sourcemod/scripting
DOCS_DEST=$RELEASEDIR/zrdocs
PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins
EXTENSIONDIR=$RELEASEDIR/addons/sourcemod/extensions EXTENSIONDIR=$RELEASEDIR/addons/sourcemod/extensions
ZIPFILE=$VERSION-r$REVISION.zip
MAKEPATCH=false MAKEPATCH=false