Merge branch 'gh-pages'

Conflicts: Docs/huepi.Lightstate.html Docs/huepi.html Docs/huepi.js.html Docs/index.html
ArndBrugman · Jun 16, 2015 · b32dbee · b32dbee
2 parents 84e6ab9 + b84e648
commit b32dbee
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 0 deletions.
diff --git a/Docs/huepi.Lightstate.html b/Docs/huepi.Lightstate.html
@@ -2068,6 +2068,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:16:06 GMT+0100 (CET)
 =======
@@ -2082,6 +2083,9 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 =======
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
 >>>>>>> gh-pages
+=======
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
+>>>>>>> gh-pages
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/Docs/huepi.html b/Docs/huepi.html
@@ -6324,6 +6324,27 @@ <h5>Parameters:</h5>
 
 
 
+<<<<<<< HEAD
+
+            <td class="description last">Range [0..1]</td>
+        </tr>
+
+
+
+        <tr>
+
+                <td class="name"><code>Green</code></td>
+
+
+            <td class="type">
+
+            </td>
+
+
+
+
+=======
+>>>>>>> gh-pages
 
             <td class="description last">Range [0..1]</td>
         </tr>
@@ -6332,6 +6353,8 @@ <h5>Parameters:</h5>
 
         <tr>
 
+<<<<<<< HEAD
+=======
                 <td class="name"><code>Green</code></td>
 
 
@@ -6350,6 +6373,7 @@ <h5>Parameters:</h5>
 
         <tr>
 
+>>>>>>> gh-pages
                 <td class="name"><code>Blue</code></td>
 
 
@@ -6876,6 +6900,8 @@ <h5>Parameters:</h5>
 
 
             <td class="description last"></td>
+<<<<<<< HEAD
+=======
         </tr>
 
 
@@ -6899,6 +6925,7 @@ <h5>Parameters:</h5>
 
 
             <td class="description last">optional</td>
+>>>>>>> gh-pages
         </tr>
 
 
@@ -6976,6 +7003,100 @@ <h4 class="name" id="GroupsGetData"><span class="type-signature"></span>GroupsGe
 
 
 
+<<<<<<< HEAD
+            <td class="type">
+
+
+<span class="param-type">number</span>
+
+
+
+            </td>
+
+
+
+
+
+            <td class="description last">optional</td>
+        </tr>
+
+
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1338">line 1338</a>
+    </li></ul></dd>
+
+
+
+
+
+
+
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="name" id="GroupsGetData"><span class="type-signature"></span>GroupsGetData<span class="signature">()</span><span class="type-signature"></span></h4>
+
+
+
+
+
+=======
+>>>>>>> gh-pages
 
 
 
@@ -11026,6 +11147,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:16:06 GMT+0100 (CET)
 =======
@@ -11040,6 +11162,9 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 =======
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
 >>>>>>> gh-pages
+=======
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
+>>>>>>> gh-pages
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/Docs/huepi.js.html b/Docs/huepi.js.html
@@ -1625,6 +1625,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:16:06 GMT+0100 (CET)
 =======
@@ -1639,6 +1640,9 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 =======
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
 >>>>>>> gh-pages
+=======
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
+>>>>>>> gh-pages
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/Docs/index.html b/Docs/index.html
@@ -59,6 +59,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:16:06 GMT+0100 (CET)
 =======
@@ -73,6 +74,9 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
 =======
     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
 >>>>>>> gh-pages
+=======
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jun 16 2015 18:34:13 GMT+0200 (CEST)
+>>>>>>> gh-pages
 </footer>
 
 <script> prettyPrint(); </script>