Fixed another merge error in patch import.

This commit is contained in:
Richard Helgeby 2009-12-26 22:17:18 +01:00
parent 097975aa2f
commit c7bb5d43b7

View File

@ -23,6 +23,13 @@ ZR_VERSION_FILE="src/zr/hgversion.h.inc"
ZR_PRODUCT_NAME="Zombie:Reloaded" ZR_PRODUCT_NAME="Zombie:Reloaded"
ZR_COPYRIGHT="Copyright (C) 2009 Greyscale, Richard Helgeby" ZR_COPYRIGHT="Copyright (C) 2009 Greyscale, Richard Helgeby"
ZR_BRANCH="zr-3.0-b2" ZR_BRANCH="zr-3.0-b2"
ZR_REVISION=$(hg id -n):$(hg id -i)
if [ $ZR_UNOFFICIAL = "true" ]
then
ZR_REVISION="Unofficial build - based on $ZR_REVISION"
fi
ZR_LICENSE="GNU GPL, Version 3" ZR_LICENSE="GNU GPL, Version 3"
ZR_DATE=$($ZR_DATEPATH -R) ZR_DATE=$($ZR_DATEPATH -R)