diff .svn/pristine/c2/c2ea979b406c20e95d30b9fa3044bb4c0af68697.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:10:11 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/c2/c2ea979b406c20e95d30b9fa3044bb4c0af68697.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,12 @@
+--- 
+wikis_001: 
+  status: 1
+  start_page: CookBook documentation
+  project_id: 1
+  id: 1
+wikis_002: 
+  status: 1
+  start_page: Start page
+  project_id: 2
+  id: 2
+  
\ No newline at end of file