Merge branch 'gh-pages' of https://github.com/ZoranPavlovic/OpenDroneMap into ccd-changes

Former-commit-id: 11fcdcb2b9
2016-01-25 09:07:39 -05:00 · 2016-01-25 09:07:39 -05:00 · f779c30ab5
commit f779c30ab5
--- a/ccd_defs.json
+++ b/ccd_defs.json
@ -1,6 +1,7 @@
 {
  "Apple iPhone 5s": 8.46,
  "Asahi Optical Co.,Ltd.  PENTAX Optio330RS": 7.176,
+  "Canon Canon IXUS 240 HS": 6.17,
  "Canon Canon DIGITAL IXUS 400": 7.176,
  "Canon Canon DIGITAL IXUS 40": 5.76,
  "Canon Canon DIGITAL IXUS 430": 6.18,