merge

doc/class/PeerJsConnector.html

@@ -72,6 +72,17 @@ user-id of the peer (browser/client). And then you can connect to it.</p>
       Receive the id of every connected peer. 
     </span>
   </li>
+  <li>
+    <span class='signature'>
+      <a href='#onNewConnection-dynamic'>
+        #
+(void)
+<b>onNewConnection</b><span>(f)</span>
+      </a>
+    </span>
+    <span class='desc'>
+    </span>
+  </li>
   <li>
     <span class='signature'>
       <a href='#addConnection-dynamic'>
@@ -194,6 +205,15 @@ on how to do that with urls.</p>
     </li>
   </ul>
 </div>
+  </div>
+  <div class='method_details'>
+    <p class='signature' id='onNewConnection-dynamic'>
+      #
+(void)
+<b>onNewConnection</b><span>(f)</span>
+      <br>
+    </p>
+    
   </div>
   <div class='method_details'>
     <p class='signature' id='addConnection-dynamic'>
@@ -222,7 +242,11 @@ on how to do that with urls.</p>
 </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>