16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ino/mcopy_camera_tests/mcopy_camera_tests.ino

Fixed gross conflict
This commit is contained in:
mmcwilliams 2016-06-09 17:23:17 -04:00
parent 11cdb9b514 c3f595b132
commit d9a18b5d43
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/data/cfg.json.default
View File

@ -33,7 +33,8 @@
"proj_backward" : "h", "proj_backward" : "h",
"proj_identifier" : "j", "proj_identifier" : "j",
"cam_identifier" : "k", "cam_identifier" : "k",
"mcopy_identifier" : "m" "mcopy_identifier" : "m",
"cam_timed" : "n"
} }
} }
} }