- Merge http://svn.icculus.org/tremulous?view=rev&revision=2185, patch by Chris Schwarz

- Remove Q_snprintf as Com_sprintf exists already

code/game/bg_lib.h

@@ -102,7 +102,6 @@ int _atoi( const char **stringPtr );
 long strtol( const char *nptr, char **endptr, int base );
 
 int Q_vsnprintf( char *buffer, size_t length, const char *fmt, va_list argptr );
-int Q_snprintf( char *buffer, size_t length, const char *fmt, ... ) __attribute__ ((format (printf, 3, 4)));
 
 int sscanf( const char *buffer, const char *fmt, ... ) __attribute__ ((format (scanf, 2, 3)));