Mercurial > hg > soundsoftware-site

diff .svn/pristine/3b/3b35bfc6a457be42f49a86352010582aa133bde7.svn-base @ 927:9ee5fd0b9bd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:13:59 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/3b/3b35bfc6a457be42f49a86352010582aa133bde7.svn-base	Fri May 11 16:13:59 2012 +0100
@@ -0,0 +1,27 @@
+welcome_1:
+  id: 1
+  page_id: 1
+  title: Welcome to the weblg
+  version: 23
+  version_type: LockedPage
+
+welcome_2:
+  id: 2
+  page_id: 1
+  title: Welcome to the weblog
+  version: 24
+  version_type: LockedPage
+
+thinking_1:
+  id: 3
+  page_id: 2
+  title: So I was thinking!!!
+  version: 23
+  version_type: SpecialLockedPage
+
+thinking_2:
+  id: 4
+  page_id: 2
+  title: So I was thinking
+  version: 24
+  version_type: SpecialLockedPage