Merge remote-tracking branch 'origin/master'

# Conflicts: # ino/mcopy_camera_tests/mcopy_camera_tests.ino Fixed gross conflict
2016-06-09 17:23:17 -04:00 · 2016-06-09 17:23:17 -04:00 · d9a18b5d43
parent 11cdb9b514 c3f595b132
commit d9a18b5d43
1 changed files with 2 additions and 1 deletions
--- a/app/data/cfg.json.default
+++ b/app/data/cfg.json.default
@ -33,7 +33,8 @@
 			"proj_backward" : "h",
 			"proj_identifier" : "j",
 			"cam_identifier" : "k",
-			"mcopy_identifier" : "m"
+			"mcopy_identifier" : "m",
+			"cam_timed" : "n"
 		}
 	}
 }