Merge branch 'conjg-gh-pages' into gh-pages

Add ccd_defs for Nikon D5300
2015-11-03 14:57:13 +00:00 · 2015-11-03 14:57:13 +00:00 · fa62369f29
commit fa62369f29
--- a/ccd_defs.json
+++ b/ccd_defs.json
@ -176,6 +176,7 @@
  "NIKON CORPORATION NIKON D70": 23.7,
  "NIKON CORPORATION NIKON D70s": 23.7,
  "NIKON CORPORATION NIKON D80": 23.6,
+  "NIKON CORPORATION NIKON D5300": 23.5,
  "NIKON D5100": 23.6,
  "NIKON E2500": 5.27,
  "NIKON E3100": 5.27,