d'oh

tools/qfcc/include/options.h

@@ -40,7 +40,7 @@ typedef struct {
 	qboolean	short_circuit;		// short circuit logic for && and ||
 	qboolean	fast_float;			// use floats directly in ifs
 	qboolean    vector_calls;		// use floats instead of vectors for constant function args
-	qboolean    local_merge;		// merge function locals into one block
+	qboolean    local_merging;		// merge function locals into one block
 	unsigned    progsversion;		// Progs version to generate code for
 } code_options_t;