[openjk] 01/06: Imported Upstream version 0~20150430+dfsg1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 8eca80805f91ff1391e17d03b9ad3e6ff8e22af3
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 11 09:26:07 2015 +0100

    Imported Upstream version 0~20150430+dfsg1
---
 codeJK2/icarus/tokenizer.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/codeJK2/icarus/tokenizer.h b/codeJK2/icarus/tokenizer.h
index 70e83de..aecb6ef 100644
--- a/codeJK2/icarus/tokenizer.h
+++ b/codeJK2/icarus/tokenizer.h
@@ -25,7 +25,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #ifndef __TOKENIZER_H
 #define __TOKENIZER_H
 
-#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
@@ -427,7 +426,7 @@ public:
 	void SetErrorProc(LPTokenizerErrorProc errorProc);
 	void AddParseStream(byte* data, long datasize);
 	bool AddParseFile(const char *filename);
-	uint32_t ParseRGB();
+	unsigned int ParseRGB();
 	long GetRemainingSize();
 
 	unsigned GetFlags();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git