OpenTyrian: merged upstream changes

2014-06-09 15:54:16 +03:00
parent 80fa885c13
commit f763376ee4
107 changed files with 3956 additions and 4820 deletions
--- a/project/jni/application/opentyrian/src/video_scale.c
+++ b/project/jni/application/opentyrian/src/video_scale.c
@@ -1,5 +1,5 @@
 /* 
- * OpenTyrian Classic: A modern cross-platform port of Tyrian
+ * OpenTyrian: A modern cross-platform port of Tyrian
 * Copyright (C) 2007-2010  The OpenTyrian Development Team
 * 
 * Scale2x, Scale3x
@@ -439,4 +439,3 @@ void scale3x_16( SDL_Surface *src_surface, SDL_Surface *dst_surface )
 	}
 }

-// kate: tab-width 4; vim: set noet: