Fixed another merge error in patch import.
This commit is contained in:
		| @@ -23,6 +23,13 @@ ZR_VERSION_FILE="src/zr/hgversion.h.inc" | ||||
| ZR_PRODUCT_NAME="Zombie:Reloaded" | ||||
| ZR_COPYRIGHT="Copyright (C) 2009  Greyscale, Richard Helgeby" | ||||
| 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_DATE=$($ZR_DATEPATH -R) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user