há 14 anos atrás · 0b19233700
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,8 @@
 
				 Debug
			
 
				 Release
			
 
				 /Build
			
 
				+/Documentation/Doxygen/output/standalone
			
 
				+Documentation/Doxygen/output/web
			
 
				 
			
 
				 /Tools/Build/Linux/polybuild*
			
 
				 /Tools/Build/Linux/polyimport*
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/annotated.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/annotated.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class List</div>  </div>
			
 
				+<h1>Class List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><table>
			
@@ -89,12 +89,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -103,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreen Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreen Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_screen.html">Polycode::PhysicsScreen</a>, including all inherited members.<table>
			
@@ -107,12 +107,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -121,7 +125,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -79,12 +79,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreen Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreen Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsScreen" -->
			
 
				 <p>A 2D Physics enabled screen.  
			
 
				- <a href="class_polycode_1_1_physics_screen.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_physics_screen-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -137,7 +137,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="class_polycode_1_1_physics_screen_entity.html">PhysicsScreenEntity</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_physics_screen.html#a0a6344bb4b0ae517fee314566b67e9f0">getPhysicsByScreenEntity</a> (ScreenEntity *ent)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the physics entity for the specified screen entity.  <a href="#a0a6344bb4b0ae517fee314566b67e9f0"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A 2D Physics enabled screen. </p>
			
 
				 <p>A <a class="el" href="class_polycode_1_1_physics_screen.html" title="A 2D Physics enabled screen.">PhysicsScreen</a> acts like a normal screen, except that entities added to it with addPhysicsChild have physics automatically simulated. You can also use it to check collisions using addCollisionChild. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -1031,12 +1031,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_screen.html">PhysicsScreen</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -1045,7 +1049,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_entity-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_entity-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreenEntity Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreenEntity Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_screen_entity.html">Polycode::PhysicsScreenEntity</a>, including all inherited members.<table>
			
@@ -91,12 +91,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -105,7 +109,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_entity.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_entity.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreenEntity Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreenEntity Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsScreenEntity" -->
			
 
				 <p>A 2D Physics enabled screen entity.  
			
 
				- <a href="class_polycode_1_1_physics_screen_entity.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_physics_screen_entity-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -112,7 +112,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_physics_screen_entity.html#ad1f055abf2c06f25f9da9c27e69ae89a">ENTITY_MESH</a> = 3</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Mesh entity. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A 2D Physics enabled screen entity. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -120,12 +120,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_screen_entity.html">PhysicsScreenEntity</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -134,7 +138,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_event-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_event-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreenEvent Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreenEvent Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_screen_event.html">Polycode::PhysicsScreenEvent</a>, including all inherited members.<table>
			
@@ -97,12 +97,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -111,7 +115,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_event.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/class_polycode_1_1_physics_screen_event.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-attribs">Public Attributes</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScreenEvent Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsScreenEvent Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsScreenEvent" -->
			
 
				 <p>Event sent out by the <a class="el" href="class_polycode_1_1_physics_screen.html" title="A 2D Physics enabled screen.">PhysicsScreen</a> class when collisions begin and end.  
			
 
				- <a href="class_polycode_1_1_physics_screen_event.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_physics_screen_event-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -133,7 +133,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_physics_screen_event.html#a1b938013be04738fc1b6dbf4601780ad">EVENT_SOLVE_SHAPE_COLLISION</a> = 3</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Event sent out when a collision begins. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Event sent out by the <a class="el" href="class_polycode_1_1_physics_screen.html" title="A 2D Physics enabled screen.">PhysicsScreen</a> class when collisions begin and end. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -141,12 +141,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_screen_event.html">PhysicsScreenEvent</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -155,7 +159,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/classes.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/classes.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class Index</div>  </div>
			
 
				+<h1>Class Index</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="qindex"><a class="qindex" href="#letter_P">P</a></div>
			
@@ -88,12 +88,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/doxygen.css
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/doxygen.css
@@ -11,12 +11,6 @@ h1 {
 
				 	font-size: 150%;
			
 
				 }
			
 
				 
			
 
				-.title {
			
 
				-	font-size: 150%;
			
 
				-	font-weight: bold;
			
 
				-	margin: 10px 2px;
			
 
				-}
			
 
				-
			
 
				 h2 {
			
 
				 	font-size: 120%;
			
 
				 }
			
@@ -191,7 +185,7 @@ body {
 
				 div.contents {
			
 
				 	margin-top: 10px;
			
 
				 	margin-left: 10px;
			
 
				-	margin-right: 5px;
			
 
				+	margin-right: 10px;
			
 
				 }
			
 
				 
			
 
				 td.indexkey {
			
@@ -367,10 +361,6 @@ table.memberdecls {
 
				         white-space: nowrap;
			
 
				 }
			
 
				 
			
 
				-.memItemRight {
			
 
				-	width: 100%;
			
 
				-}
			
 
				-
			
 
				 .memTemplParams {
			
 
				 	color: #4665A2;
			
 
				         white-space: nowrap;
			
@@ -398,14 +388,9 @@ table.memberdecls {
 
				 	padding: 2px;
			
 
				 }
			
 
				 
			
 
				-.mempage {
			
 
				-	width: 100%;
			
 
				-}
			
 
				-
			
 
				 .memitem {
			
 
				 	padding: 0;
			
 
				 	margin-bottom: 10px;
			
 
				-	margin-right: 5px;
			
 
				 }
			
 
				 
			
 
				 .memname {
			
@@ -739,7 +724,7 @@ dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated,
 
				 
			
 
				 dl.note
			
 
				 {
			
 
				-        border-color: #D0C000;
			
 
				+        border-color: #D0D000;
			
 
				 }
			
 
				 
			
 
				 dl.warning, dl.attention
			
@@ -786,21 +771,21 @@ dl.bug
 
				  
			
 
				 #projectname
			
 
				 {
			
 
				-	font: 300% Tahoma, Arial,sans-serif;
			
 
				+	font: 300% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				-	padding: 2px 0px;
			
 
				+	padding: 0px;
			
 
				 }
			
 
				     
			
 
				 #projectbrief
			
 
				 {
			
 
				-	font: 120% Tahoma, Arial,sans-serif;
			
 
				+	font: 120% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				 	padding: 0px;
			
 
				 }
			
 
				 
			
 
				 #projectnumber
			
 
				 {
			
 
				-	font: 50% Tahoma, Arial,sans-serif;
			
 
				+	font: 50% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				 	padding: 0px;
			
 
				 }
			
@@ -813,23 +798,3 @@ dl.bug
 
				 	border-bottom: 1px solid #5373B4;
			
 
				 }
			
 
				 
			
 
				-.image
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.dotgraph
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.mscgraph
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.caption
			
 
				-{
			
 
				-	font-weight: bold;
			
 
				-}
			
 
				-
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/functions.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/functions.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -271,12 +271,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -285,7 +289,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/functions_func.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/functions_func.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -165,12 +165,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -179,7 +183,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/functions_vars.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/functions_vars.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -128,12 +128,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -142,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics2D/html/index.html
+++ b/Documentation/Doxygen/output/standalone/Physics2D/html/index.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -70,19 +70,23 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Physics2D Documentation</div>  </div>
			
 
				+<h1>Physics2D Documentation</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 </div>
			
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Physics2D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics2D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -91,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/annotated.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/annotated.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class List</div>  </div>
			
 
				+<h1>Class List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><table>
			
@@ -96,12 +96,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionScene Member List</div>  </div>
			
 
				+<h1>Polycode::CollisionScene Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_collision_scene.html">Polycode::CollisionScene</a>, including all inherited members.<table>
			
@@ -87,12 +87,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -101,7 +105,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionScene Class Reference</div>  </div>
			
 
				+<h1>Polycode::CollisionScene Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::CollisionScene" -->
			
 
				 <p>A scene that tracks collisions between entities.  
			
 
				- <a href="class_polycode_1_1_collision_scene.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_physics_scene.html">Polycode::PhysicsScene</a>.</p>
			
 
				 
			
@@ -120,7 +120,7 @@ virtual <a class="el" href="class_polycode_1_1_collision_scene_entity.html">Coll
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8ac0cf1bf43263376ca47db8944f63bc"></a><!-- doxytag: member="Polycode::CollisionScene::adjustForCollision" ref="a8ac0cf1bf43263376ca47db8944f63bc" args="(CollisionSceneEntity *collisionEntity)" -->
			
 
				 void&#160;</td><td class="memItemRight" valign="bottom"><b>adjustForCollision</b> (<a class="el" href="class_polycode_1_1_collision_scene_entity.html">CollisionSceneEntity</a> *collisionEntity)</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A scene that tracks collisions between entities. </p>
			
 
				 <p>The collision scene acts like a regular scene, only it automatically tracks collisions between its child entities. </p>
			
 
				 </div></div>
			
@@ -129,12 +129,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>adjustForCollision</b
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_collision_scene.html">CollisionScene</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -143,7 +147,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>adjustForCollision</b
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene_entity-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene_entity-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionSceneEntity Member List</div>  </div>
			
 
				+<h1>Polycode::CollisionSceneEntity Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_collision_scene_entity.html">Polycode::CollisionSceneEntity</a>, including all inherited members.<table>
			
@@ -96,12 +96,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene_entity.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_collision_scene_entity.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionSceneEntity Class Reference</div>  </div>
			
 
				+<h1>Polycode::CollisionSceneEntity Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::CollisionSceneEntity" -->
			
 
				 <p>A wrapped around SceneEntity that provides collision information.  
			
 
				- <a href="class_polycode_1_1_collision_scene_entity.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_physics_scene_entity.html">Polycode::PhysicsSceneEntity</a>.</p>
			
 
				 
			
@@ -134,7 +134,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_collision_scene_entity.html#af59b9b7312b8a769378790ef76952248">SHAPE_CYLINDER</a> = 8</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Cylinder shape. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A wrapped around SceneEntity that provides collision information. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -142,12 +142,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_collision_scene_entity.html">CollisionSceneEntity</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -156,7 +160,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_character-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_character-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsCharacter Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsCharacter Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_character.html">Polycode::PhysicsCharacter</a>, including all inherited members.<table>
			
@@ -96,12 +96,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_character.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_character.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,12 +78,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsCharacter Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsCharacter Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsCharacter" --><!-- doxytag: inherits="Polycode::PhysicsSceneEntity" -->
			
 
				 <p>A Physics character controller.  
			
 
				- <a href="class_polycode_1_1_physics_character.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_physics_scene_entity.html">Polycode::PhysicsSceneEntity</a>.</p>
			
 
				 
			
@@ -109,7 +109,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>setMaxJumpHeight</b>
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae7c7b5110f0c7976b0253df0de842ec3"></a><!-- doxytag: member="Polycode::PhysicsCharacter::onGround" ref="ae7c7b5110f0c7976b0253df0de842ec3" args="()" -->
			
 
				 bool&#160;</td><td class="memItemRight" valign="bottom"><b>onGround</b> ()</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A Physics character controller. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -117,12 +117,16 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>onGround</b> ()</td><
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_character.html">PhysicsCharacter</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -131,7 +135,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>onGround</b> ()</td><
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScene Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsScene Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_scene.html">Polycode::PhysicsScene</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsScene Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsScene Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsScene" --><!-- doxytag: inherits="Polycode::CollisionScene" -->
			
 
				 <p>A scene subclass that simulates physics for its children.  
			
 
				- <a href="class_polycode_1_1_physics_scene.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_collision_scene.html">Polycode::CollisionScene</a>.</p>
			
 
				 
			
@@ -108,7 +108,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a34c9951e1403b981fa6360927c8a0fc8"></a><!-- doxytag: member="Polycode::PhysicsScene::addVehicleChild" ref="a34c9951e1403b981fa6360927c8a0fc8" args="(SceneEntity *newEntity, Number mass, Number friction, int group=1)" -->
			
 
				 <a class="el" href="class_polycode_1_1_physics_vehicle.html">PhysicsVehicle</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>addVehicleChild</b> (SceneEntity *newEntity, Number mass, Number friction, int group=1)</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A scene subclass that simulates physics for its children. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -116,12 +116,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_scene.html">PhysicsScene</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -130,7 +134,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene_entity-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene_entity-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsSceneEntity Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsSceneEntity Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_scene_entity.html">Polycode::PhysicsSceneEntity</a>, including all inherited members.<table>
			
@@ -96,12 +96,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene_entity.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_scene_entity.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsSceneEntity Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsSceneEntity Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsSceneEntity" --><!-- doxytag: inherits="Polycode::CollisionSceneEntity" -->
			
 
				 <p>A wrapper around SceneEntity that provides physics information.  
			
 
				- <a href="class_polycode_1_1_physics_scene_entity.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_collision_scene_entity.html">Polycode::CollisionSceneEntity</a>.</p>
			
 
				 
			
@@ -134,7 +134,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_physics_scene_entity.html#a3d798de2b58a13a71fecd3c60861fffd">SHAPE_CYLINDER</a> = 8</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Cylinder shape. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A wrapper around SceneEntity that provides physics information. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -142,12 +142,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_scene_entity.html">PhysicsSceneEntity</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -156,7 +160,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsVehicle Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsVehicle Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_vehicle.html">Polycode::PhysicsVehicle</a>, including all inherited members.<table>
			
@@ -96,12 +96,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,12 +78,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsVehicle Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsVehicle Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsVehicle" --><!-- doxytag: inherits="Polycode::PhysicsSceneEntity" -->
			
 
				 <p>A physics vehicle controller.  
			
 
				- <a href="class_polycode_1_1_physics_vehicle.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_physics_scene_entity.html">Polycode::PhysicsSceneEntity</a>.</p>
			
 
				 
			
@@ -105,7 +105,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>setBrake</b> (Number
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6180c5150e64dd24e02b6fe6467d22ef"></a><!-- doxytag: member="Polycode::PhysicsVehicle::warpVehicle" ref="a6180c5150e64dd24e02b6fe6467d22ef" args="(Vector3 position)" -->
			
 
				 void&#160;</td><td class="memItemRight" valign="bottom"><b>warpVehicle</b> (Vector3 position)</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A physics vehicle controller. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -113,12 +113,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>warpVehicle</b> (Vect
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_vehicle.html">PhysicsVehicle</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -127,7 +131,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>warpVehicle</b> (Vect
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle_wheel_info-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle_wheel_info-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsVehicleWheelInfo Member List</div>  </div>
			
 
				+<h1>Polycode::PhysicsVehicleWheelInfo Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_physics_vehicle_wheel_info.html">Polycode::PhysicsVehicleWheelInfo</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle_wheel_info.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/class_polycode_1_1_physics_vehicle_wheel_info.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::PhysicsVehicleWheelInfo Class Reference</div>  </div>
			
 
				+<h1>Polycode::PhysicsVehicleWheelInfo Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::PhysicsVehicleWheelInfo" -->
			
 
				 <p>Physics vehicle wheel info.  
			
 
				- <a href="class_polycode_1_1_physics_vehicle_wheel_info.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_physics_vehicle_wheel_info-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -98,7 +98,7 @@ unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
				 SceneEntity *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_physics_vehicle_wheel_info.html#a40b3ad215e3227d0aef94061f2e9fab5">wheelEntity</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Wheel scene entity. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Physics vehicle wheel info. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -106,12 +106,16 @@ SceneEntity *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_physics_vehicle_wheel_info.html">PhysicsVehicleWheelInfo</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -120,7 +124,7 @@ SceneEntity *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/classes.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/classes.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class Index</div>  </div>
			
 
				+<h1>Class Index</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="qindex"><a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a></div>
			
@@ -91,12 +91,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -105,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/doxygen.css
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/doxygen.css
@@ -11,12 +11,6 @@ h1 {
 
				 	font-size: 150%;
			
 
				 }
			
 
				 
			
 
				-.title {
			
 
				-	font-size: 150%;
			
 
				-	font-weight: bold;
			
 
				-	margin: 10px 2px;
			
 
				-}
			
 
				-
			
 
				 h2 {
			
 
				 	font-size: 120%;
			
 
				 }
			
@@ -191,7 +185,7 @@ body {
 
				 div.contents {
			
 
				 	margin-top: 10px;
			
 
				 	margin-left: 10px;
			
 
				-	margin-right: 5px;
			
 
				+	margin-right: 10px;
			
 
				 }
			
 
				 
			
 
				 td.indexkey {
			
@@ -367,10 +361,6 @@ table.memberdecls {
 
				         white-space: nowrap;
			
 
				 }
			
 
				 
			
 
				-.memItemRight {
			
 
				-	width: 100%;
			
 
				-}
			
 
				-
			
 
				 .memTemplParams {
			
 
				 	color: #4665A2;
			
 
				         white-space: nowrap;
			
@@ -398,14 +388,9 @@ table.memberdecls {
 
				 	padding: 2px;
			
 
				 }
			
 
				 
			
 
				-.mempage {
			
 
				-	width: 100%;
			
 
				-}
			
 
				-
			
 
				 .memitem {
			
 
				 	padding: 0;
			
 
				 	margin-bottom: 10px;
			
 
				-	margin-right: 5px;
			
 
				 }
			
 
				 
			
 
				 .memname {
			
@@ -739,7 +724,7 @@ dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated,
 
				 
			
 
				 dl.note
			
 
				 {
			
 
				-        border-color: #D0C000;
			
 
				+        border-color: #D0D000;
			
 
				 }
			
 
				 
			
 
				 dl.warning, dl.attention
			
@@ -786,21 +771,21 @@ dl.bug
 
				  
			
 
				 #projectname
			
 
				 {
			
 
				-	font: 300% Tahoma, Arial,sans-serif;
			
 
				+	font: 300% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				-	padding: 2px 0px;
			
 
				+	padding: 0px;
			
 
				 }
			
 
				     
			
 
				 #projectbrief
			
 
				 {
			
 
				-	font: 120% Tahoma, Arial,sans-serif;
			
 
				+	font: 120% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				 	padding: 0px;
			
 
				 }
			
 
				 
			
 
				 #projectnumber
			
 
				 {
			
 
				-	font: 50% Tahoma, Arial,sans-serif;
			
 
				+	font: 50% arial,sans-serif;
			
 
				 	margin: 0px;
			
 
				 	padding: 0px;
			
 
				 }
			
@@ -813,23 +798,3 @@ dl.bug
 
				 	border-bottom: 1px solid #5373B4;
			
 
				 }
			
 
				 
			
 
				-.image
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.dotgraph
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.mscgraph
			
 
				-{
			
 
				-        text-align: center;
			
 
				-}
			
 
				-
			
 
				-.caption
			
 
				-{
			
 
				-	font-weight: bold;
			
 
				-}
			
 
				-
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/functions.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/functions.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -159,12 +159,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -173,7 +177,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/functions_func.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/functions_func.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -99,12 +99,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -113,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/functions_vars.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/functions_vars.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -150,12 +150,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -164,7 +168,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/hierarchy.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/hierarchy.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class Hierarchy</div>  </div>
			
 
				+<h1>Class Hierarchy</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="textblock">This inheritance list is sorted roughly, but not completely, alphabetically:</div>    <script type="text/javascript">
			
@@ -157,12 +157,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -171,7 +175,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/index.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/index.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -70,19 +70,23 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Physics3D Documentation</div>  </div>
			
 
				+<h1>Physics3D Documentation</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 </div>
			
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -91,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_collision_result-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_collision_result-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionResult Member List</div>  </div>
			
 
				+<h1>Polycode::CollisionResult Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="struct_polycode_1_1_collision_result.html">Polycode::CollisionResult</a>, including all inherited members.<table>
			
@@ -89,12 +89,16 @@ This is the complete list of members for <a class="el" href="struct_polycode_1_1
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -103,7 +107,7 @@ This is the complete list of members for <a class="el" href="struct_polycode_1_1
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_collision_result.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_collision_result.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CollisionResult Struct Reference</div>  </div>
			
 
				+<h1>Polycode::CollisionResult Struct Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::CollisionResult" -->
			
 
				 <p>Result of a collision test.  
			
 
				- <a href="struct_polycode_1_1_collision_result.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="struct_polycode_1_1_collision_result-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -101,7 +101,7 @@ Vector3&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
 
				 Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_polycode_1_1_collision_result.html#a36eb38e7a6eaa3212f9208c41cd30cf7">colDist</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Collision distance. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Result of a collision test. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -109,12 +109,16 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="struct_polycode_1_1_collision_result.html">CollisionResult</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -123,7 +127,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_ray_test_result-members.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_ray_test_result-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::RayTestResult Member List</div>  </div>
			
 
				+<h1>Polycode::RayTestResult Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="struct_polycode_1_1_ray_test_result.html">Polycode::RayTestResult</a>, including all inherited members.<table>
			
@@ -89,12 +89,16 @@ This is the complete list of members for <a class="el" href="struct_polycode_1_1
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -103,7 +107,7 @@ This is the complete list of members for <a class="el" href="struct_polycode_1_1
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_ray_test_result.html
+++ b/Documentation/Doxygen/output/standalone/Physics3D/html/struct_polycode_1_1_ray_test_result.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::RayTestResult Struct Reference</div>  </div>
			
 
				+<h1>Polycode::RayTestResult Struct Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::RayTestResult" -->
			
 
				 <p>Result of a ray test.  
			
 
				- <a href="struct_polycode_1_1_ray_test_result.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="struct_polycode_1_1_ray_test_result-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -101,7 +101,7 @@ Vector3&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
 
				 Vector3&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_polycode_1_1_ray_test_result.html#a0a58fd2168dce307b27d232f0e146017">position</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Ray position. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Result of a ray test. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -109,12 +109,16 @@ Vector3&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="struct_polycode_1_1_ray_test_result.html">RayTestResult</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:08 for Physics3D by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Physics3D by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -123,7 +127,7 @@ Vector3&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/annotated.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/annotated.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Class List</div>  </div>
			
 
				+<h1>Class List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><table>
			
@@ -154,12 +154,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -168,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_curve-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_curve-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierCurve Member List</div>  </div>
			
 
				+<h1>Polycode::BezierCurve Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_bezier_curve.html">Polycode::BezierCurve</a>, including all inherited members.<table>
			
@@ -98,12 +98,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -112,7 +116,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_curve.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_curve.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierCurve Class Reference</div>  </div>
			
 
				+<h1>Polycode::BezierCurve Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::BezierCurve" -->
			
 
				 <p>A Bezier curve.  
			
 
				- <a href="class_polycode_1_1_bezier_curve.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_bezier_curve-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -117,7 +117,7 @@ Public Member Functions</h2></td></tr>
 
				 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_bezier_curve.html#aa61f90ad035abe7f45c13dfbdbbf67d1">rebuildBuffers</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Rebuilds the height cache buffers for 2d height curves. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A Bezier curve. </p>
			
 
				 <p>This class can be used to draw smooth curves or move things smoothly on curves. It's also used internally for skeletal animation. The curves are 3-dimensional, but convenience methods are added for 2d curves and there is a caching mechanism for 2d height data to speed up bezier curve usage in animation.</p>
			
 
				 <p>A bezier curve consists of control points, each having 3 points: one middle point and two 'handles'. The middle point is the actual position of the control point and the two side points serve as vectors defining how the curve curves towards the next control points. </p>
			
@@ -567,12 +567,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_bezier_curve.html">BezierCurve</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -581,7 +585,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_path_tween-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_path_tween-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierPathTween Member List</div>  </div>
			
 
				+<h1>Polycode::BezierPathTween Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_bezier_path_tween.html">Polycode::BezierPathTween</a>, including all inherited members.<table>
			
@@ -98,12 +98,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -112,7 +116,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_path_tween.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_path_tween.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierPathTween Class Reference</div>  </div>
			
 
				+<h1>Polycode::BezierPathTween Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::BezierPathTween" --><!-- doxytag: inherits="Polycode::Tween" -->
			
 
				 <p>Tweens a position along a bezier path.  
			
 
				- <a href="class_polycode_1_1_bezier_path_tween.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_tween.html">Polycode::Tween</a>.</p>
			
 
				 
			
@@ -96,7 +96,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_bezier_path_tween.html#abdce5b221c749db5386c57c36b4b9ce1">BezierPathTween</a> (<a class="el" href="class_polycode_1_1_vector3.html">Vector3</a> *target, <a class="el" href="class_polycode_1_1_bezier_curve.html">BezierCurve</a> *curve, int easeType, Number time, bool repeat=false)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Constructor.  <a href="#abdce5b221c749db5386c57c36b4b9ce1"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Tweens a position along a bezier path. </p>
			
 
				 <p>This class automatically animates a 3d position over a 3d bezier curve. You can use it for 2d curves as well, of course, just ignore the z! </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -169,12 +169,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_bezier_path_tween.html">BezierPathTween</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -183,7 +187,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_point-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_point-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierPoint Member List</div>  </div>
			
 
				+<h1>Polycode::BezierPoint Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_bezier_point.html">Polycode::BezierPoint</a>, including all inherited members.<table>
			
@@ -90,12 +90,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -104,7 +108,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_point.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bezier_point.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BezierPoint Class Reference</div>  </div>
			
 
				+<h1>Polycode::BezierPoint Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::BezierPoint" -->
			
 
				 <p>A curve point defined by 3 positions.  
			
 
				- <a href="class_polycode_1_1_bezier_point.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_bezier_point-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -106,7 +106,7 @@ Public Attributes</h2></td></tr>
 
				 <a class="el" href="class_polycode_1_1_vector3.html">Vector3</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_bezier_point.html#ae38306570055c7c65172eb1b7652bd30">p3</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Second handle position. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A curve point defined by 3 positions. </p>
			
 
				 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="class_polycode_1_1_bezier_curve.html" title="A Bezier curve.">BezierCurve</a> </dd></dl>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -201,12 +201,16 @@ Public Attributes</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_bezier_point.html">BezierPoint</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -215,7 +219,7 @@ Public Attributes</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Bone Member List</div>  </div>
			
 
				+<h1>Polycode::Bone Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_bone.html">Polycode::Bone</a>, including all inherited members.<table>
			
@@ -182,12 +182,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -196,7 +200,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Bone Class Reference</div>  </div>
			
 
				+<h1>Polycode::Bone Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Bone" --><!-- doxytag: inherits="Polycode::SceneEntity" -->
			
 
				 <p><a class="el" href="class_polycode_1_1_skeleton.html" title="3D skeleton.">Skeleton</a> bone.  
			
 
				- <a href="class_polycode_1_1_bone.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_scene_entity.html">Polycode::SceneEntity</a>.</p>
			
 
				 
			
@@ -135,7 +135,7 @@ Public Attributes</h2></td></tr>
 
				 int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_bone.html#a56f77aecc15f94e5098773fc65448008">parentBoneId</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Id of the bone. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p><a class="el" href="class_polycode_1_1_skeleton.html" title="3D skeleton.">Skeleton</a> bone. </p>
			
 
				 <p>Bones are bound to vertices of a mesh and when transformed, move the bound vertices of the mesh along with them. Bones are subclassed from <a class="el" href="class_polycode_1_1_scene_entity.html" title="3D base entity.">SceneEntity</a>, but have their own hierarchy system. </p>
			
 
				 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="class_polycode_1_1_skeleton.html" title="3D skeleton.">Skeleton</a> </dd></dl>
			
@@ -527,12 +527,16 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_bone.html">Bone</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -541,7 +545,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone_assignment-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone_assignment-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BoneAssignment Member List</div>  </div>
			
 
				+<h1>Polycode::BoneAssignment Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_bone_assignment.html">Polycode::BoneAssignment</a>, including all inherited members.<table>
			
@@ -89,12 +89,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -103,7 +107,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone_assignment.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_bone_assignment.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::BoneAssignment Class Reference</div>  </div>
			
 
				+<h1>Polycode::BoneAssignment Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::BoneAssignment" -->
			
 
				 <p><a class="el" href="class_polycode_1_1_bone.html" title="Skeleton bone.">Bone</a> assignment.  
			
 
				- <a href="class_polycode_1_1_bone_assignment.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_bone_assignment-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -101,7 +101,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 <a class="el" href="class_polycode_1_1_bone.html">Bone</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_bone_assignment.html#a56694bc502ce18f7bd2212988cad4cbd">bone</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Assigned bone. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p><a class="el" href="class_polycode_1_1_bone.html" title="Skeleton bone.">Bone</a> assignment. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -109,12 +109,16 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_bone_assignment.html">BoneAssignment</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -123,7 +127,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_camera-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_camera-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Camera Member List</div>  </div>
			
 
				+<h1>Polycode::Camera Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_camera.html">Polycode::Camera</a>, including all inherited members.<table>
			
@@ -175,12 +175,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -189,7 +193,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_camera.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_camera.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Camera Class Reference</div>  </div>
			
 
				+<h1>Polycode::Camera Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Camera" --><!-- doxytag: inherits="Polycode::SceneEntity" -->
			
 
				 <p><a class="el" href="class_polycode_1_1_camera.html" title="Camera in a 3D scene.">Camera</a> in a 3D scene.  
			
 
				- <a href="class_polycode_1_1_camera.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_scene_entity.html">Polycode::SceneEntity</a>.</p>
			
 
				 
			
@@ -119,7 +119,7 @@ vector&lt; ShaderBinding * &gt;&#160;</td><td class="memItemRight" valign="botto
 
				 Material *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_camera.html#ab687525c3a989ead6584923e00ebc7d9">getScreenShaderMaterial</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the shader material applied to the camera. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p><a class="el" href="class_polycode_1_1_camera.html" title="Camera in a 3D scene.">Camera</a> in a 3D scene. </p>
			
 
				 <p>Cameras can be added to a scene and changed between dynamically. You can also set a shader to a camera that will run as a screen shader for post-processing effects. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -335,12 +335,16 @@ Material *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_camera.html">Camera</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -349,7 +353,7 @@ Material *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_color-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_color-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Color Member List</div>  </div>
			
 
				+<h1>Polycode::Color Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_color.html">Polycode::Color</a>, including all inherited members.<table>
			
@@ -106,12 +106,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -120,7 +124,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_color.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_color.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Color Class Reference</div>  </div>
			
 
				+<h1>Polycode::Color Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Color" -->
			
 
				 <p>Stores and manipulates color information.  
			
 
				- <a href="class_polycode_1_1_color.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_color-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -141,7 +141,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_color.html#a22f1865f0810fac0c21b51884f5870fb">a</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Alpha value. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Stores and manipulates color information. </p>
			
 
				 <p><a class="el" href="class_polycode_1_1_color.html" title="Stores and manipulates color information.">Color</a> is always RGBA in Polycode. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -620,12 +620,16 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_color.html">Color</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -634,7 +638,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_config-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_config-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Config Member List</div>  </div>
			
 
				+<h1>Polycode::Config Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_config.html">Polycode::Config</a>, including all inherited members.<table>
			
@@ -93,12 +93,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -107,7 +111,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_config.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_config.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Config Class Reference</div>  </div>
			
 
				+<h1>Polycode::Config Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Config" -->
			
 
				 <p>Saves and loads simple config files.  
			
 
				- <a href="class_polycode_1_1_config.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_config-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -107,7 +107,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="class_polycode_1_1_string.html">String</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_config.html#aee54250d236b7098c3dcc906a3572f56">getStringValue</a> (<a class="el" href="class_polycode_1_1_string.html">String</a> configNamespace, <a class="el" href="class_polycode_1_1_string.html">String</a> key)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns a string value by a string key.  <a href="#aee54250d236b7098c3dcc906a3572f56"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Saves and loads simple config files. </p>
			
 
				 <p><a class="el" href="class_polycode_1_1_config.html" title="Saves and loads simple config files.">Config</a> stores, loads and saves string and number values associated by string keys. You can use to easily save and load settings and preferences and other data. Configs are separated by namespaces, so you can have multiple configs with the same keys. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -347,12 +347,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_config.html">Config</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -361,7 +365,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Core Member List</div>  </div>
			
 
				+<h1>Polycode::Core Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_core.html">Polycode::Core</a>, including all inherited members.<table>
			
@@ -123,12 +123,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -137,7 +141,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Core Class Reference</div>  </div>
			
 
				+<h1>Polycode::Core Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Core" --><!-- doxytag: inherits="Polycode::EventDispatcher" -->
			
 
				 <p>The main core of the framework.  
			
 
				- <a href="class_polycode_1_1_core.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_event_dispatcher.html">Polycode::EventDispatcher</a>.</p>
			
 
				 
			
@@ -155,7 +155,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 <tr><td class="memItemLeft" align="right" valign="top">Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_core.html#a9b46ba83949395dd7d59ff675557e1ac">getTicksFloat</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the total ticks elapsed since launch.  <a href="#a9b46ba83949395dd7d59ff675557e1ac"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>The main core of the framework. </p>
			
 
				 <p>The core deals with system-level functions, such as window initialization and OS interaction. Each platform has its own implementation of this base class. NOTE: SOME OF THE FUNCTIONALITY IN THE CORE IS NOT FULLY IMPLEMENTED!! </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -890,12 +890,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_core.html">Core</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -904,7 +908,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_input-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_input-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CoreInput Member List</div>  </div>
			
 
				+<h1>Polycode::CoreInput Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_core_input.html">Polycode::CoreInput</a>, including all inherited members.<table>
			
@@ -101,12 +101,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -115,7 +119,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_input.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_input.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CoreInput Class Reference</div>  </div>
			
 
				+<h1>Polycode::CoreInput Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::CoreInput" --><!-- doxytag: inherits="Polycode::EventDispatcher" -->
			
 
				 <p>User input event dispatcher.  
			
 
				- <a href="class_polycode_1_1_core_input.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_event_dispatcher.html">Polycode::EventDispatcher</a>.</p>
			
 
				 
			
@@ -114,7 +114,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_core_input.html#a23f5361d8c5db77fde822aa741fcab64">MOUSE_BUTTON3</a> = 2</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Middle mouse button. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>User input event dispatcher. </p>
			
 
				 <p>The <a class="el" href="class_polycode_1_1_core.html" title="The main core of the framework.">Core</a> input class is where all of the input events originate. You can add event listeners to this class to listen for user input events or poll it manually to check the state of user input. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -214,12 +214,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_core_input.html">CoreInput</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -228,7 +232,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_services-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_services-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CoreServices Member List</div>  </div>
			
 
				+<h1>Polycode::CoreServices Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_core_services.html">Polycode::CoreServices</a>, including all inherited members.<table>
			
@@ -107,12 +107,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -121,7 +125,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_services.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_core_services.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-static-methods">Static Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::CoreServices Class Reference</div>  </div>
			
 
				+<h1>Polycode::CoreServices Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::CoreServices" --><!-- doxytag: inherits="Polycode::EventDispatcher" -->
			
 
				 <p>Global services singleton.  
			
 
				- <a href="class_polycode_1_1_core_services.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_event_dispatcher.html">Polycode::EventDispatcher</a>.</p>
			
 
				 
			
@@ -125,7 +125,7 @@ Static Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="class_polycode_1_1_core_services.html">CoreServices</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_core_services.html#aa866a94166ee4a67a68179e0c6660bf2">getInstance</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the singleton instance.  <a href="#aa866a94166ee4a67a68179e0c6660bf2"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Global services singleton. </p>
			
 
				 <p><a class="el" href="class_polycode_1_1_core_services.html" title="Global services singleton.">CoreServices</a> instantiates and provides global Singleton access to all of the main manager classes in Polycode as well as the <a class="el" href="class_polycode_1_1_renderer.html" title="Main renderer.">Renderer</a> and <a class="el" href="class_polycode_1_1_config.html" title="Saves and loads simple config files.">Config</a> classes. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -432,12 +432,16 @@ Static Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_core_services.html">CoreServices</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -446,7 +450,7 @@ Static Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_data-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_data-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Data Member List</div>  </div>
			
 
				+<h1>Polycode::Data Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_data.html">Polycode::Data</a>, including all inherited members.<table>
			
@@ -92,12 +92,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -106,7 +110,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_data.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_data.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Data Class Reference</div>  </div>
			
 
				+<h1>Polycode::Data Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Data" -->
			
 
				 <p>Stores, saves and loads data.  
			
 
				- <a href="class_polycode_1_1_data.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_data-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -105,7 +105,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_data.html#ab96d4c6fbeaabac72e43afa28fe68b9f">getData</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns pointer to the data.  <a href="#ab96d4c6fbeaabac72e43afa28fe68b9f"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Stores, saves and loads data. </p>
			
 
				 <p>This class can save and load arbitrary data to and from disk and convert it to strings. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -247,12 +247,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_data.html">Data</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -261,7 +265,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_entity-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_entity-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Entity Member List</div>  </div>
			
 
				+<h1>Polycode::Entity Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_entity.html">Polycode::Entity</a>, including all inherited members.<table>
			
@@ -160,12 +160,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -174,7 +178,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_entity.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_entity.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Entity Class Reference</div>  </div>
			
 
				+<h1>Polycode::Entity Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Entity" -->
			
 
				 <p>Base class for both 2D and 3D objects in Polycode.  
			
 
				- <a href="class_polycode_1_1_entity.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_scene_entity.html">Polycode::SceneEntity</a>, and <a class="el" href="class_polycode_1_1_screen_entity.html">Polycode::ScreenEntity</a>.</p>
			
 
				 
			
@@ -227,8 +227,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Sets the bounding box radius.  <a href="#a64ddcd6e7d967cf6f2daeb05ce97dd9e"></a><br/></td></tr>
			
 
				 <tr><td colspan="2"><h2><a name="member-group"></a>
			
 
				 Rendering properties</h2></td></tr>
			
 
				-<tr><td class="ititle" colspan="2"><p><a class="anchor" id="amgrp6a38b0d14f8248d0953ef13055fd623b"></a>Methods and properties affecting the way the entity is rendered. </p>
			
 
				-</td></tr>
			
 
				+<tr><td colspan="2"><a class="anchor" id="amgrp6a38b0d14f8248d0953ef13055fd623b"></a>Methods and properties affecting the way the entity is rendered. <br/></td></tr>
			
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a19e5e66fc9b646ac871a2ee531e7f54c"></a><!-- doxytag: member="Polycode::Entity::custEntityType" ref="a19e5e66fc9b646ac871a2ee531e7f54c" args="" -->
			
 
				 <a class="el" href="class_polycode_1_1_string.html">String</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_entity.html#a19e5e66fc9b646ac871a2ee531e7f54c">custEntityType</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">You can set a custom string identifier for user purposes. <br/></td></tr>
			
@@ -271,7 +270,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_entity.html#a15c9cd3c14aa53447b5184792f6a7d96">clearMask</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Removes the entity's mask. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Base class for both 2D and 3D objects in Polycode. </p>
			
 
				 <p>It provides position and color transformations as well as hierarchy for all Polycode objects. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -1810,12 +1809,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_entity.html">Entity</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -1824,7 +1827,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Event Member List</div>  </div>
			
 
				+<h1>Polycode::Event Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_event.html">Polycode::Event</a>, including all inherited members.<table>
			
@@ -90,12 +90,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -104,7 +108,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Event Class Reference</div>  </div>
			
 
				+<h1>Polycode::Event Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Event" -->
			
 
				 <p><a class="el" href="class_polycode_1_1_event.html" title="Event base class.">Event</a> base class.  
			
 
				- <a href="class_polycode_1_1_event.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_input_event.html">Polycode::InputEvent</a>, and Polycode::ScreenEvent.</p>
			
 
				 
			
@@ -103,7 +103,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="class_polycode_1_1_event_dispatcher.html">EventDispatcher</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_event.html#a865dab523a98779f25c844aa0f396847">getDispatcher</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the event dispatcher which originated the event.  <a href="#a865dab523a98779f25c844aa0f396847"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p><a class="el" href="class_polycode_1_1_event.html" title="Event base class.">Event</a> base class. </p>
			
 
				 <p>Subclass this class to pass complex data through events. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -177,12 +177,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_event.html">Event</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -191,7 +195,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_dispatcher-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_dispatcher-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::EventDispatcher Member List</div>  </div>
			
 
				+<h1>Polycode::EventDispatcher Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_event_dispatcher.html">Polycode::EventDispatcher</a>, including all inherited members.<table>
			
@@ -94,12 +94,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -108,7 +112,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_dispatcher.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_dispatcher.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::EventDispatcher Class Reference</div>  </div>
			
 
				+<h1>Polycode::EventDispatcher Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::EventDispatcher" --><!-- doxytag: inherits="Polycode::EventHandler" -->
			
 
				 <p>Can dispatch events.  
			
 
				- <a href="class_polycode_1_1_event_dispatcher.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_event_handler.html">Polycode::EventHandler</a>.</p>
			
 
				 
			
@@ -110,7 +110,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 <tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_event_dispatcher.html#a94dbbe7ea180d4241d4abc2c5028a9b0">dispatchEvent</a> (<a class="el" href="class_polycode_1_1_event.html">Event</a> *event, int eventCode)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Dispatches an event to all handlers listening for the event code specified.  <a href="#a94dbbe7ea180d4241d4abc2c5028a9b0"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Can dispatch events. </p>
			
 
				 <p>The event dispatcher is base class which allows its subclass to dispatch custom events which <a class="el" href="class_polycode_1_1_event_handler.html" title="Can handle events from EventDispatcher classes.">EventHandler</a> subclasses can then listen to. <a class="el" href="class_polycode_1_1_event_dispatcher.html" title="Can dispatch events.">EventDispatcher</a> and <a class="el" href="class_polycode_1_1_event_handler.html" title="Can handle events from EventDispatcher classes.">EventHandler</a> are the two main classes in the Polycode event system. If you are familiar with ActionScript3's event system, you will find this to be very similar, except that it uses integers for event codes for speed, rather than strings. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -259,12 +259,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_event_dispatcher.html">EventDispatcher</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -273,7 +277,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_handler-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_handler-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::EventHandler Member List</div>  </div>
			
 
				+<h1>Polycode::EventHandler Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_event_handler.html">Polycode::EventHandler</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_handler.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_event_handler.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::EventHandler Class Reference</div>  </div>
			
 
				+<h1>Polycode::EventHandler Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::EventHandler" -->
			
 
				 <p>Can handle events from <a class="el" href="class_polycode_1_1_event_dispatcher.html" title="Can dispatch events.">EventDispatcher</a> classes.  
			
 
				- <a href="class_polycode_1_1_event_handler.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_event_dispatcher.html">Polycode::EventDispatcher</a>, and <a class="el" href="class_polycode_1_1_scene_entity.html">Polycode::SceneEntity</a>.</p>
			
 
				 
			
@@ -99,7 +99,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_event_handler.html#a770df65f0135582b95b53c4067fb8a28">handleEvent</a> (<a class="el" href="class_polycode_1_1_event.html">Event</a> *event)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This method gets called by an <a class="el" href="class_polycode_1_1_event_dispatcher.html" title="Can dispatch events.">EventDispatcher</a> that the handler is listening to if the dispatching event's code matches the code that handler is listening for.  <a href="#a770df65f0135582b95b53c4067fb8a28"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Can handle events from <a class="el" href="class_polycode_1_1_event_dispatcher.html" title="Can dispatch events.">EventDispatcher</a> classes. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
 
				 <a class="anchor" id="a770df65f0135582b95b53c4067fb8a28"></a><!-- doxytag: member="Polycode::EventHandler::handleEvent" ref="a770df65f0135582b95b53c4067fb8a28" args="(Event *event)" -->
			
@@ -131,12 +131,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_event_handler.html">EventHandler</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -145,7 +149,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_font_manager-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_font_manager-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::FontManager Member List</div>  </div>
			
 
				+<h1>Polycode::FontManager Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_font_manager.html">Polycode::FontManager</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_font_manager.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_font_manager.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::FontManager Class Reference</div>  </div>
			
 
				+<h1>Polycode::FontManager Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::FontManager" -->
			
 
				 <p>Manages fonts.  
			
 
				- <a href="class_polycode_1_1_font_manager.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_font_manager-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -96,7 +96,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">Font *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_font_manager.html#aa23dd0f0ff835cf9192b01a52e51d1e3">getFontByName</a> (<a class="el" href="class_polycode_1_1_string.html">String</a> fontName)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retuns a font based on the registerd font name.  <a href="#aa23dd0f0ff835cf9192b01a52e51d1e3"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Manages fonts. </p>
			
 
				 <p>The font manager shoudl only be accessed via the <a class="el" href="class_polycode_1_1_core_services.html" title="Global services singleton.">CoreServices</a> singleton. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -168,12 +168,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_font_manager.html">FontManager</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -182,7 +186,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_image-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_image-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Image Member List</div>  </div>
			
 
				+<h1>Polycode::Image Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_image.html">Polycode::Image</a>, including all inherited members.<table>
			
@@ -108,12 +108,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -122,7 +126,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_image.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_image.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Image Class Reference</div>  </div>
			
 
				+<h1>Polycode::Image Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Image" -->
			
 
				 <p>An image in memory.  
			
 
				- <a href="class_polycode_1_1_image.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by Polycode::Label.</p>
			
 
				 
			
@@ -142,7 +142,7 @@ unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
				 <tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_image.html#a38ea1e88e03ce1e17ca303274bb23214">getPixels</a> ()</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the raw image data.  <a href="#a38ea1e88e03ce1e17ca303274bb23214"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>An image in memory. </p>
			
 
				 <p>Basic RGB or RGBA images stored in memory. Can be loaded from PNG files, created into textures and written to file. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -862,12 +862,16 @@ unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_image.html">Image</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -876,7 +880,7 @@ unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_input_event-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_input_event-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::InputEvent Member List</div>  </div>
			
 
				+<h1>Polycode::InputEvent Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_input_event.html">Polycode::InputEvent</a>, including all inherited members.<table>
			
@@ -94,12 +94,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -108,7 +112,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_input_event.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_input_event.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::InputEvent Class Reference</div>  </div>
			
 
				+<h1>Polycode::InputEvent Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::InputEvent" --><!-- doxytag: inherits="Polycode::Event" -->
			
 
				 <p><a class="el" href="class_polycode_1_1_event.html" title="Event base class.">Event</a> dispatched by <a class="el" href="class_polycode_1_1_core_input.html" title="User input event dispatcher.">CoreInput</a>.  
			
 
				- <a href="class_polycode_1_1_input_event.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherits <a class="el" href="class_polycode_1_1_event.html">Polycode::Event</a>.</p>
			
 
				 
			
@@ -133,7 +133,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><b>EVENT_KEY
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afe23d29c63d87347a736d0a31a482e86"></a><!-- doxytag: member="Polycode::InputEvent::EVENT_KEYUP" ref="afe23d29c63d87347a736d0a31a482e86" args="" -->
			
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><b>EVENT_KEYUP</b> = 14</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p><a class="el" href="class_polycode_1_1_event.html" title="Event base class.">Event</a> dispatched by <a class="el" href="class_polycode_1_1_core_input.html" title="User input event dispatcher.">CoreInput</a>. </p>
			
 
				 <p>This event is dispatched by <a class="el" href="class_polycode_1_1_core_input.html" title="User input event dispatcher.">CoreInput</a> when input happens. </p>
			
 
				 </div></div>
			
@@ -142,12 +142,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><b>EVENT_KEY
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_input_event.html">InputEvent</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -156,7 +160,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><b>EVENT_KEY
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_material_manager-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_material_manager-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::MaterialManager Member List</div>  </div>
			
 
				+<h1>Polycode::MaterialManager Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_material_manager.html">Polycode::MaterialManager</a>, including all inherited members.<table>
			
@@ -87,12 +87,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -101,7 +105,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_material_manager.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_material_manager.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::MaterialManager Class Reference</div>  </div>
			
 
				+<h1>Polycode::MaterialManager Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::MaterialManager" -->
			
 
				 <p>Manages loading and reloading of materials, textures and shaders.  
			
 
				- <a href="class_polycode_1_1_material_manager.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_material_manager-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -95,7 +95,7 @@ Public Member Functions</h2></td></tr>
 
				 Texture *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_material_manager.html#a42fea28487ab871c4daf6165135c61ad">createFramebufferTexture</a> (int width, int height, int type)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates a new framebuffer texture. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Manages loading and reloading of materials, textures and shaders. </p>
			
 
				 <p>This class should be only accessed from the <a class="el" href="class_polycode_1_1_core_services.html" title="Global services singleton.">CoreServices</a> singleton. </p>
			
 
				 </div></div>
			
@@ -104,12 +104,16 @@ Texture *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href=
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_material_manager.html">MaterialManager</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -118,7 +122,7 @@ Texture *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href=
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_matrix4-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_matrix4-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Matrix4 Member List</div>  </div>
			
 
				+<h1>Polycode::Matrix4 Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_matrix4.html">Polycode::Matrix4</a>, including all inherited members.<table>
			
@@ -96,12 +96,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -110,7 +114,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_matrix4.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_matrix4.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Matrix4 Class Reference</div>  </div>
			
 
				+<h1>Polycode::Matrix4 Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Matrix4" -->
			
 
				 <p>4x4 Matrix.  
			
 
				- <a href="class_polycode_1_1_matrix4.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_matrix4-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -128,7 +128,7 @@ Number *&#160;</td><td class="memItemRight" valign="bottom"><b>operator[]</b> (i
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af832a86f465d2f3d48353e75b4768d10"></a><!-- doxytag: member="Polycode::Matrix4::operator*" ref="af832a86f465d2f3d48353e75b4768d10" args="(const Matrix4 &amp;m2) const " -->
			
 
				 <a class="el" href="class_polycode_1_1_matrix4.html">Matrix4</a>&#160;</td><td class="memItemRight" valign="bottom"><b>operator*</b> (const <a class="el" href="class_polycode_1_1_matrix4.html">Matrix4</a> &amp;m2) const </td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>4x4 Matrix. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
 
				 <a class="anchor" id="a175b8cca7a8dda325dbcd7b19fa34d85"></a><!-- doxytag: member="Polycode::Matrix4::getEulerAngles" ref="a175b8cca7a8dda325dbcd7b19fa34d85" args="(Number *ax, Number *ay, Number *az)" -->
			
@@ -295,12 +295,16 @@ Number *&#160;</td><td class="memItemRight" valign="bottom"><b>operator[]</b> (i
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_matrix4.html">Matrix4</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -309,7 +313,7 @@ Number *&#160;</td><td class="memItemRight" valign="bottom"><b>operator[]</b> (i
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_mesh-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_mesh-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Mesh Member List</div>  </div>
			
 
				+<h1>Polycode::Mesh Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_mesh.html">Polycode::Mesh</a>, including all inherited members.<table>
			
@@ -120,12 +120,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -134,7 +138,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_mesh.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_mesh.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -82,12 +82,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-attribs">Public Attributes</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Mesh Class Reference</div>  </div>
			
 
				+<h1>Polycode::Mesh Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Mesh" -->
			
 
				 <p>A polygonal mesh.  
			
 
				- <a href="class_polycode_1_1_mesh.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_mesh-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -176,7 +176,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_mesh.html#af81ca7493b1b4750925ae38d84e0c10b">POINT_MESH</a> = 5</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Point based mesh. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A polygonal mesh. </p>
			
 
				 <p>The mesh is assembled from <a class="el" href="class_polycode_1_1_polygon.html" title="A polygon structure.">Polygon</a> instances, which in turn contain <a class="el" href="class_polycode_1_1_vertex.html" title="A mesh vertex.">Vertex</a> instances. This structure is provided for convenience and when the mesh is rendered, it is cached into vertex arrays with no notions of separate polygons. When data in the mesh changes, arrayDirtyMap must be set to true for the appropriate array types (color, position, normal, etc). Available types are defined in <a class="el" href="class_polycode_1_1_render_data_array.html" title="Render data array.">RenderDataArray</a>. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
@@ -878,12 +878,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_mesh.html">Mesh</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -892,7 +896,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Object Member List</div>  </div>
			
 
				+<h1>Polycode::Object Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_object.html">Polycode::Object</a>, including all inherited members.<table>
			
@@ -90,12 +90,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -104,7 +108,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Object Class Reference</div>  </div>
			
 
				+<h1>Polycode::Object Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Object" -->
			
 
				 <p>Basic dictionary data object.  
			
 
				- <a href="class_polycode_1_1_object.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_object-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -105,7 +105,7 @@ Public Attributes</h2></td></tr>
 
				 <a class="el" href="class_polycode_1_1_object_entry.html">ObjectEntry</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_object.html#ae1eb5e32490d48bf1486f8ccccaf278b">root</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Root object entry. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Basic dictionary data object. </p>
			
 
				 <p>Objects can store organized data and save and load it from disk. An object contains a hierarchy of <a class="el" href="class_polycode_1_1_object_entry.html" title="Single entry in an Object.">ObjectEntry</a> classes which hold the actual data. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -166,12 +166,16 @@ Public Attributes</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_object.html">Object</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -180,7 +184,7 @@ Public Attributes</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object_entry-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object_entry-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::ObjectEntry Member List</div>  </div>
			
 
				+<h1>Polycode::ObjectEntry Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_object_entry.html">Polycode::ObjectEntry</a>, including all inherited members.<table>
			
@@ -101,12 +101,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -115,7 +119,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object_entry.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_object_entry.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::ObjectEntry Class Reference</div>  </div>
			
 
				+<h1>Polycode::ObjectEntry Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::ObjectEntry" -->
			
 
				 <p>Single entry in an <a class="el" href="class_polycode_1_1_object.html" title="Basic dictionary data object.">Object</a>.  
			
 
				- <a href="class_polycode_1_1_object_entry.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_object_entry-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -132,7 +132,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_object_entry.html#abdf92d7a74a91142a5f51540f799dff3">length</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Length of this object entry if its type is ARRAY_ENTRY. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Single entry in an <a class="el" href="class_polycode_1_1_object.html" title="Basic dictionary data object.">Object</a>. </p>
			
 
				 <p><a class="el" href="class_polycode_1_1_object.html" title="Basic dictionary data object.">Object</a> entries can be accessed as dictionaries or arrays. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
@@ -385,12 +385,16 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_object_entry.html">ObjectEntry</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -399,7 +403,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_particle_emitter-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_particle_emitter-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::ParticleEmitter Member List</div>  </div>
			
 
				+<h1>Polycode::ParticleEmitter Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_particle_emitter.html">Polycode::ParticleEmitter</a>, including all inherited members.<table>
			
@@ -116,12 +116,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -130,7 +134,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_particle_emitter.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_particle_emitter.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -82,12 +82,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-attribs">Public Attributes</a> &#124;
			
 
				 <a href="#pub-static-attribs">Static Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::ParticleEmitter Class Reference</div>  </div>
			
 
				+<h1>Polycode::ParticleEmitter Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::ParticleEmitter" -->
			
 
				 <p>Particle emitter base.  
			
 
				- <a href="class_polycode_1_1_particle_emitter.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p>Inherited by <a class="el" href="class_polycode_1_1_scene_particle_emitter.html">Polycode::SceneParticleEmitter</a>, and <a class="el" href="class_polycode_1_1_screen_particle_emitter.html">Polycode::ScreenParticleEmitter</a>.</p>
			
 
				 
			
@@ -186,7 +186,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_particle_emitter.html#aae695703a19f27accead7eba693ed1af">TRIGGERED_EMITTER</a> = 1</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Triggered emitter setting. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Particle emitter base. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
 
				 <a class="anchor" id="afa43c6a34ba6c0c8b5ee0be8e7a3044a"></a><!-- doxytag: member="Polycode::ParticleEmitter::setParticleBlendingMode" ref="afa43c6a34ba6c0c8b5ee0be8e7a3044a" args="(int mode)" -->
			
@@ -279,12 +279,16 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_particle_emitter.html">ParticleEmitter</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -293,7 +297,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><a class="el
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_perlin-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_perlin-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Perlin Member List</div>  </div>
			
 
				+<h1>Polycode::Perlin Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_perlin.html">Polycode::Perlin</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_perlin.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_perlin.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Perlin Class Reference</div>  </div>
			
 
				+<h1>Polycode::Perlin Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Perlin" -->
			
 
				 <p>2D <a class="el" href="class_polycode_1_1_perlin.html" title="2D Perlin noise.">Perlin</a> noise.  
			
 
				- <a href="class_polycode_1_1_perlin.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_perlin-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -96,7 +96,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="memItemLeft" align="right" valign="top">Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_perlin.html#aeeac49cd6df4835633ba073195b6aa9d">Get</a> (Number x, Number y)</td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns noise value at the specified coordinate.  <a href="#aeeac49cd6df4835633ba073195b6aa9d"></a><br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>2D <a class="el" href="class_polycode_1_1_perlin.html" title="2D Perlin noise.">Perlin</a> noise. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
 
				 <a class="anchor" id="ae3a8f5d42d1f4dcb032ad36eba0bfadd"></a><!-- doxytag: member="Polycode::Perlin::Perlin" ref="ae3a8f5d42d1f4dcb032ad36eba0bfadd" args="(int octaves, Number freq, Number amp, int seed)" -->
			
@@ -192,12 +192,16 @@ Public Member Functions</h2></td></tr>
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_perlin.html">Perlin</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -206,7 +210,7 @@ Public Member Functions</h2></td></tr>
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_polygon-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_polygon-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Polygon Member List</div>  </div>
			
 
				+<h1>Polycode::Polygon Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_polygon.html">Polycode::Polygon</a>, including all inherited members.<table>
			
@@ -98,12 +98,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -112,7 +116,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_polygon.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_polygon.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Polygon Class Reference</div>  </div>
			
 
				+<h1>Polycode::Polygon Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Polygon" -->
			
 
				 <p>A polygon structure.  
			
 
				- <a href="class_polycode_1_1_polygon.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_polygon-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -123,7 +123,7 @@ Public Attributes</h2></td></tr>
 
				 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_polygon.html#a9b212c1225586c7ad625e91c2ab71f41">useVertexNormals</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">If true, will use vertex normals, if false will use the polygon normal. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>A polygon structure. </p>
			
 
				 </div><hr/><h2>Member Function Documentation</h2>
			
 
				 <a class="anchor" id="a2a71a8e402fba3957a4db3523180861d"></a><!-- doxytag: member="Polycode::Polygon::addVertex" ref="a2a71a8e402fba3957a4db3523180861d" args="(Number x, Number y, Number z)" -->
			
@@ -367,12 +367,16 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_polygon.html">Polygon</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -381,7 +385,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_quaternion-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_quaternion-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Quaternion Member List</div>  </div>
			
 
				+<h1>Polycode::Quaternion Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_quaternion.html">Polycode::Quaternion</a>, including all inherited members.<table>
			
@@ -88,12 +88,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -102,7 +106,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_quaternion.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_quaternion.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -80,12 +80,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				   <div class="summary">
			
 
				 <a href="#pub-methods">Public Member Functions</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Quaternion Class Reference</div>  </div>
			
 
				+<h1>Polycode::Quaternion Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Quaternion" -->
			
 
				 <p>Rotation quaternion.  
			
 
				- <a href="class_polycode_1_1_quaternion.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_quaternion-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -98,8 +98,7 @@ Public Member Functions</h2></td></tr>
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Default constructor. <br/></td></tr>
			
 
				 <tr><td colspan="2"><h2><a name="member-group"></a>
			
 
				 Public members</h2></td></tr>
			
 
				-<tr><td class="ititle" colspan="2"><p><a class="anchor" id="amgrp63d9f9d885dd3d1d2735dbba80dd860a"></a>Available public members </p>
			
 
				-</td></tr>
			
 
				+<tr><td colspan="2"><a class="anchor" id="amgrp63d9f9d885dd3d1d2735dbba80dd860a"></a>Available public members <br/></td></tr>
			
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8a1e91f8b8e46f038b36a63ff6908740"></a><!-- doxytag: member="Polycode::Quaternion::x" ref="a8a1e91f8b8e46f038b36a63ff6908740" args="" -->
			
 
				 Number&#160;</td><td class="memItemRight" valign="bottom"><b>x</b></td></tr>
			
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4c434bc294174f6df89d9b2e7fbed327"></a><!-- doxytag: member="Polycode::Quaternion::y" ref="a4c434bc294174f6df89d9b2e7fbed327" args="" -->
			
@@ -161,7 +160,7 @@ static <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a>&#1
 
				 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae1baf8096d9f68c7f75e4e8ddb4d9129"></a><!-- doxytag: member="Polycode::Quaternion::Squad" ref="ae1baf8096d9f68c7f75e4e8ddb4d9129" args="(Number fT, const Quaternion &amp;rkP, const Quaternion &amp;rkA, const Quaternion &amp;rkB, const Quaternion &amp;rkQ, bool shortestPath)" -->
			
 
				 static <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a>&#160;</td><td class="memItemRight" valign="bottom"><b>Squad</b> (Number fT, const <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a> &amp;rkP, const <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a> &amp;rkA, const <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a> &amp;rkB, const <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a> &amp;rkQ, bool shortestPath)</td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Rotation quaternion. </p>
			
 
				 </div><hr/><h2>Constructor &amp; Destructor Documentation</h2>
			
 
				 <a class="anchor" id="aa74251a1d30f330c8d73184b7d7e1d4b"></a><!-- doxytag: member="Polycode::Quaternion::Quaternion" ref="aa74251a1d30f330c8d73184b7d7e1d4b" args="(Number w, Number x, Number y, Number z)" -->
			
@@ -220,12 +219,16 @@ static <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a>&#1
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -234,7 +237,7 @@ static <a class="el" href="class_polycode_1_1_quaternion.html">Quaternion</a>&#1
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_rectangle-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_rectangle-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Rectangle Member List</div>  </div>
			
 
				+<h1>Polycode::Rectangle Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_rectangle.html">Polycode::Rectangle</a>, including all inherited members.<table>
			
@@ -93,12 +93,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -107,7 +111,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_rectangle.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_rectangle.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -81,12 +81,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <a href="#pub-methods">Public Member Functions</a> &#124;
			
 
				 <a href="#pub-attribs">Public Attributes</a>  </div>
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::Rectangle Class Reference</div>  </div>
			
 
				+<h1>Polycode::Rectangle Class Reference</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 <!-- doxytag: class="Polycode::Rectangle" -->
			
 
				 <p>Basic rectangle.  
			
 
				- <a href="class_polycode_1_1_rectangle.html#details">More...</a></p>
			
 
				+<a href="#_details">More...</a></p>
			
 
				 
			
 
				 <p><a href="class_polycode_1_1_rectangle-members.html">List of all members.</a></p>
			
 
				 <table class="memberdecls">
			
@@ -116,7 +116,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_polycode_1_1_rectangle.html#a76ac605b46c85d9260d1e199729bf904">h</a></td></tr>
			
 
				 <tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Height. <br/></td></tr>
			
 
				 </table>
			
 
				-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
			
 
				+<hr/><a name="_details"></a><h2>Detailed Description</h2>
			
 
				 <div class="textblock"><p>Basic rectangle. </p>
			
 
				 </div></div>
			
 
				 </div>
			
@@ -124,12 +124,16 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				     <ul>
			
 
				       <li class="navelem"><b>Polycode</b>      </li>
			
 
				       <li class="navelem"><a class="el" href="class_polycode_1_1_rectangle.html">Rectangle</a>      </li>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -138,7 +142,7 @@ Number&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="cl
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>
			
--- a/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_render_data_array-members.html
+++ b/Documentation/Doxygen/output/standalone/Polycode/html/class_polycode_1_1_render_data_array-members.html
@@ -16,7 +16,7 @@ $(document).ready(initResizable);
 
				 <link href="doxygen.css" rel="stylesheet" type="text/css"/>
			
 
				 </head>
			
 
				 <body onload='searchBox.OnSelectItem(0);'>
			
 
				-<!-- Generated by Doxygen 1.7.4 -->
			
 
				+<!-- Generated by Doxygen 1.7.3 -->
			
 
				 <script type="text/javascript"><!--
			
 
				 var searchBox = new SearchBox("searchBox", "search",false,'Search');
			
 
				 --></script>
			
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
				 <div id="doc-content">
			
 
				 <div class="header">
			
 
				   <div class="headertitle">
			
 
				-<div class="title">Polycode::RenderDataArray Member List</div>  </div>
			
 
				+<h1>Polycode::RenderDataArray Member List</h1>  </div>
			
 
				 </div>
			
 
				 <div class="contents">
			
 
				 This is the complete list of members for <a class="el" href="class_polycode_1_1_render_data_array.html">Polycode::RenderDataArray</a>, including all inherited members.<table>
			
@@ -90,12 +90,16 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 </div>
			
 
				   <div id="nav-path" class="navpath">
			
 
				     <ul>
			
 
				+<<<<<<< HEAD
			
 
				       <li class="footer">Generated on Thu Aug 18 2011 15:46:07 for Polycode by&#160;
			
 
				+=======
			
 
				+      <li class="footer">Generated on Wed Jun 15 2011 19:03:13 for Polycode by&#160;
			
 
				+>>>>>>> 3bb0f5be08f293eaf8bf100a1676aeb901824edc
			
 
				 <a href="http://www.doxygen.org/index.html">
			
 
				-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </li>
			
 
				+<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.3 </li>
			
 
				     </ul>
			
 
				   </div>
			
 
				-<!-- window showing the filter options -->
			
 
				+<!--- window showing the filter options -->
			
 
				 <div id="MSearchSelectWindow"
			
 
				      onmouseover="return searchBox.OnSearchSelectShow()"
			
 
				      onmouseout="return searchBox.OnSearchSelectHide()"
			
@@ -104,7 +108,7 @@ This is the complete list of members for <a class="el" href="class_polycode_1_1_
 
				 
			
 
				 <!-- iframe showing the search results (closed by default) -->
			
 
				 <div id="MSearchResultsWindow">
			
 
				-<iframe src="javascript:void(0)" frameborder="0" 
			
 
				+<iframe src="" frameborder="0" 
			
 
				         name="MSearchResults" id="MSearchResults">
			
 
				 </iframe>
			
 
				 </div>