Merge with master

jcubic · Jul 5, 2016 · e9f4f8f · e9f4f8f
2 parents d5b2ff5 + a57bed5
commit e9f4f8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,7 +10,8 @@
           fix exec after init when used with JSON-RPC with system.describe
           make set_interpreter return terminal object
           logout when onBeforeLogin return false
-0.10.11   fix check arity for nested object; throw error when calling logout in lqqogin
+0.10.12   Fix css animation of blinking in minified file
+0.10.11   fix check arity for nested object; throw error when calling logout in login
 0.10.10   Escape brackets while echo completion strings
 0.10.9    fix issue with jQuery Timers when page included another jQuery after initialization
 0.10.8    add mangle option to uglifyjs

diff --git a/examples/rpc-demo.html b/examples/rpc-demo.html
@@ -7,7 +7,11 @@
     <meta name="Description" content="Demonstration for JQuery Terminal Emulator using call automaticly JSON-RPC service (in php) with authentication."/>
     <script src="../js/jquery-1.7.1.min.js"></script>
     <script src="../js/jquery.mousewheel-min.js"></script>
+<<<<<<< HEAD
     <script src="../js/jquery.terminal-src.js"></script>
+=======
+    <script src="../js/jquery.terminal.min.js"></script>
+>>>>>>> master
     <link href="../css/jquery.terminal.css" rel="stylesheet"/>
     <script>
     jQuery(document).ready(function($) {