From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Mon, 16 Jul 2012 10:28:06 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~442
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abdda3ee1bd5ea8c638877d592bd23ff6653e4b8;p=xonotic%2Fgmqcc.git

Merge branch 'master' into blub/bc3
---

abdda3ee1bd5ea8c638877d592bd23ff6653e4b8
diff --cc ir.c
index 1bf5513,6a6d51a..612ce90
--- a/ir.c
+++ b/ir.c
@@@ -56,15 -54,12 +56,15 @@@ uint16_t type_store_instr[TYPE_COUNT] 
      INSTR_STORE_FNC,
      INSTR_STORE_ENT, /* should use I */
  #if 0
 -    INSTR_STORE_ENT, /* integer type */
 +    INSTR_STORE_I, /* integer type */
  #endif
 -    INSTR_STORE_V, /* variant, should never be accessed */
 +    INSTR_STORE_Q,
 +    INSTR_STORE_M,
 +
 +    INSTR_STORE_M, /* variant, should never be accessed */
  };
  
- uint16_t type_store_instr[TYPE_COUNT] = {
+ uint16_t type_storep_instr[TYPE_COUNT] = {
      INSTR_STOREP_F, /* should use I when having integer support */
      INSTR_STOREP_S,
      INSTR_STOREP_F,