merge

2014-10-06 14:19:56 +02:00
parent 693f9bab67 98e582c413
commit d2f16eaa87
62 changed files with 2357 additions and 481 deletions
--- a/doc/file/lib/Connectors/IwcConnector.coffee.html
+++ b/doc/file/lib/Connectors/IwcConnector.coffee.html
@@ -100,7 +100,11 @@
 </div>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Connectors/PeerJsConnector.coffee.html
+++ b/doc/file/lib/Connectors/PeerJsConnector.coffee.html
@@ -158,7 +158,11 @@
 </div>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Connectors/TestConnector.coffee.html
+++ b/doc/file/lib/Connectors/TestConnector.coffee.html
@@ -39,7 +39,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Engine.coffee.html
+++ b/doc/file/lib/Engine.coffee.html
@@ -48,7 +48,11 @@
 </dl>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Frameworks/JsonFramework.coffee.html
+++ b/doc/file/lib/Frameworks/JsonFramework.coffee.html
@@ -60,7 +60,11 @@
 </dl>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Frameworks/TextFramework.coffee.html
+++ b/doc/file/lib/Frameworks/TextFramework.coffee.html
@@ -60,7 +60,11 @@
 </dl>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Frameworks/XmlFramework.coffee.html
+++ b/doc/file/lib/Frameworks/XmlFramework.coffee.html
@@ -60,7 +60,11 @@
 </dl>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/HistoryBuffer.coffee.html
+++ b/doc/file/lib/HistoryBuffer.coffee.html
@@ -48,7 +48,11 @@
 </dl>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Types/BasicTypes.coffee.html
+++ b/doc/file/lib/Types/BasicTypes.coffee.html
@@ -39,7 +39,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Types/JsonTypes.coffee.html
+++ b/doc/file/lib/Types/JsonTypes.coffee.html
@@ -39,7 +39,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Types/StructuredTypes.coffee.html
+++ b/doc/file/lib/Types/StructuredTypes.coffee.html
@@ -39,7 +39,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Types/TextTypes.coffee.html
+++ b/doc/file/lib/Types/TextTypes.coffee.html
@@ -39,7 +39,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/Types/XmlTypes.coffee.html
+++ b/doc/file/lib/Types/XmlTypes.coffee.html
@@ -53,15 +53,34 @@ But yatta&#39;s proxy may be called only once!</p>
 <div class='tags'>
 </div>
  </dd>
+  <dt id='Element.prototype._proxy-variable'>
+    Element.prototype._proxy
+    =
+  </dt>
+  <dd>
+    <pre><code class='coffeescript'>_proxy</code></pre>
+    
+  </dd>
 </dl>
      <h2>Method Summary</h2>
      <ul class='summary'>
  <li>
    <span class='signature'>
-      <a href='#Element-'>
+      <a href='#dont_proxy-'>
        ~
 (void)
-<b>Element</b><span>(f_name, f)</span>
+<b>dont_proxy</b><span>(f)</span>
+      </a>
+    </span>
+    <span class='desc'>
+    </span>
+  </li>
+  <li>
+    <span class='signature'>
+      <a href='#_proxy-'>
+        ~
+(void)
+<b>_proxy</b><span>(f_name, f)</span>
      </a>
    </span>
    <span class='desc'>
@@ -71,10 +90,19 @@ But yatta&#39;s proxy may be called only once!</p>
      <h2>Method Details</h2>
      <div class='methods'>
  <div class='method_details'>
-    <p class='signature' id='Element-'>
+    <p class='signature' id='dont_proxy-'>
      ~
 (void)
-<b>Element</b><span>(f_name, f)</span>
+<b>dont_proxy</b><span>(f)</span>
+      <br>
+    </p>
+    
+  </div>
+  <div class='method_details'>
+    <p class='signature' id='_proxy-'>
+      ~
+(void)
+<b>_proxy</b><span>(f_name, f)</span>
      <br>
    </p>
    
@@ -82,7 +110,11 @@ But yatta&#39;s proxy may be called only once!</p>
 </div>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 02, 14 15:16:56 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>
--- a/doc/file/lib/index.coffee.html
+++ b/doc/file/lib/index.coffee.html
@@ -37,7 +37,11 @@
      </table>
    </div>
    <div id='footer'>
+<<<<<<< HEAD
  October 06, 14 10:34:33 by
+=======
+  October 06, 14 10:16:21 by
+>>>>>>> XML-Support
  <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
    Codo
  </a>