Merge colorpicker changes into release
Compare changes
- Aashish Chaudhary authored
+ 3
− 3
@@ -6,8 +6,7 @@ Document Conventions
@@ -95,7 +94,8 @@ A description of each secondary object is warranted before showing their use and
* ``colormap`` - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.