Merge branch 'release-0.2'

tulth · Mar 3, 2015 · aecac8d · aecac8d
2 parents 0b221cd + 268a682
commit aecac8d
Show file tree

Hide file tree

Showing 2 changed files with 389 additions and 282 deletions.
diff --git a/defaults.json b/defaults.json
@@ -745,5 +745,6 @@
                 "kbScanCode": "KC_NOKEY"
             }
         }
-    }
+    },
+    "configFormat": "HumanReadableFormat"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -745,5 +745,6 @@ @@
                     "kbScanCode": "KC_NOKEY"
                 }
             }
-        }
+        },
+        "configFormat": "HumanReadableFormat"
     }