Merge pull request #4977 from klingerj/fuchsia-color-spelling

Fixed spelling of Color.FUCHSIA
CesiumGS · Feb 9, 2017 · 33b6bf0 · 33b6bf0
2 parents f8335d0 + 95d9b17
commit 33b6bf0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,8 @@ Change Log
 ==========
 
 ### 1.31 - 2017-03-01
+* Breaking changes
+  * Corrected spelling of `Color.FUCHSIA` from `Color.FUSCHIA`
 * Added support to `DebugCameraPrimitive` to draw multifrustum planes. The attribute `debugShowFrustumPlanes` of `Scene` and `frustumPlanes` of `CesiumInspector` toggles this. `FrameState` has been augmented to include `frustumSplits` which is a `Number[]` of the near/far planes of the camera frustums.
 * Enable rendering `GroundPrimitives` on hardware without the `EXT_frag_depth` extension; however, this could cause artifacts for certain viewing angles.
 * Added compressed texture support. [#4758](https://github.com/AnalyticalGraphicsInc/cesium/pull/4758)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -126,3 +126,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Aristeidis Bampakos](https://github.com/bampakoa)
 * [Jane Minghui Guo](https://github.com/Jane-Of-Art)
 * [Prasanna Natarajan](https://github.com/PrasannaNatarajan)
+* [Joseph Klinger](https://github.com/klingerj)
diff --git a/Source/Core/Color.js b/Source/Core/Color.js
@@ -1374,7 +1374,7 @@ define([
      * @constant
      * @type {Color}
      */
-    Color.FUSCHIA = freezeObject(Color.fromCssColorString('#FF00FF'));
+    Color.FUCHSIA = freezeObject(Color.fromCssColorString('#FF00FF'));
 
     /**
      * An immutable Color instance initialized to CSS color #DCDCDC