Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 9 insertions, 0 deletions

diff --git a/credits.html b/credits.html
index 1cc36c78..082eefd4 100644
--- a/credits.html
+++ b/credits.html
@@ -95,5 +95,14 @@
             <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li>

         </ul>

     </div>

+

+    <div>

+        js-beautify

+        <ul>

+            <li>Written by Einar Lielmanis, <a href="mailto:einar@jsbeautifier.org">einar@jsbeautifier.org</a>. Python version flourished by <a href="http://github.com/satufk">Stefano Sanfilippo</a> with help from <a href="http://jason.diamond.name/weblog/">Jason&nbsp;Diamond</a>, Patrick&nbsp;Hof, Nochum&nbsp;Sossonko, Andreas&nbsp;Schneider, Dave&nbsp;Vasilevsky, <a href="http://my.opera.com/Vital/blog/">Vital&nbsp;Batmanov,</a> Ron&nbsp;Baldwin, Gabriel&nbsp;Harrison, <a href="http://shullian.com">Chris&nbsp;J.&nbsp;Shull</a>, <a href="http://mathiasbynens.be/">Mathias Bynens</a> and others.</li>

+            <li>Code from: <a href="https://github.com/einars/js-beautify" target="_blank">https://github.com/einars/js-beautify</a></li>

+            <li>License: <a href="https://github.com/einars/js-beautify/blob/master/license.txt" target="_blank">https://github.com/einars/js-beautify/blob/master/license.txt</a></li>

+        </ul>

+    </div>

         </body>

 </html>
\ No newline at end of file