Author: abroekhuis
Date: Fri Jul 15 09:30:02 2011
New Revision: 792728
Log:
Publishing merge to celix site by abroekhuis
Added:
websites/production/celix/content/celix/documentation/memorypools.html
- copied unchanged from r792727,
websites/staging/celix/trunk/content/celix/documentation/memorypools.html
websites/production/celix/content/celix/images/memory_pools.png
- copied unchanged from r792727,
websites/staging/celix/trunk/content/celix/images/memory_pools.png
websites/production/celix/content/celix/memorypools.html
- copied unchanged from r792727,
websites/staging/celix/trunk/content/celix/memorypools.html
Modified:
websites/production/celix/ (props changed)
websites/production/celix/content/celix/documentation.html
Propchange: websites/production/celix/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 09:30:02 2011
@@ -1 +1 @@
-/websites/staging/celix/trunk:785476-792564
+/websites/staging/celix/trunk:785476-792727
Modified: websites/production/celix/content/celix/documentation.html
==============================================================================
--- websites/production/celix/content/celix/documentation.html (original)
+++ websites/production/celix/content/celix/documentation.html Fri Jul 15
09:30:02 2011
@@ -106,6 +106,7 @@
<ul>
<li><a href="/celix/documentation/buildingandrunning.html">Building and
Running Celix</a></li>
<li><a href="/celix/documentation/design.html">Design</a></li>
+<li><a href="/celix/documentation/memorypools.html">Memory Pools</a></li>
<li><a href="/celix/documentation/examples.html">Examples</a><ul>
<li><a href="/celix/examples/helloworld.html">Hello World Example</a></li>
</ul>
