Merge remote-tracking branch 'origin/master' into develop

keyboards/tiger910/info.json

@@ -64,7 +64,7 @@
                 {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (B3,D3)", "x":14, "y":3},
                 {"label":"K3F (B3,D4)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.56},
+                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5},
                 {"label":"K41 (B4,B6)", "x":1.5, "y":4},
                 {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5},
                 {"label":"K46 (B4,C3)", "x":4, "y":4, "w":7},

keyboards/txuu/info.json

@@ -3,8 +3,11 @@
     "maintainer": "matthewdias", 
     "width": 16, 
     "height": 5, 
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
                 {"label":"0,0", "x":0, "y":0},
                 {"label":"0,1", "x":1, "y":0},

keyboards/txuu/txuu.h

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define XXX KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \