Mercurial > hg > soundsoftware-site

diff .svn/pristine/e9/e983e3278ec4a038212a8ec1e595dbdd03e2c9d6.svn-base @ 926:b73a59a6acbd luisf

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:10:11 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/e9/e983e3278ec4a038212a8ec1e595dbdd03e2c9d6.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,16 @@
+welcome_2:
+  id: 1
+  page_id: 1
+  title: Welcome to the weblog
+  body: Such a lovely day
+  version: 24
+  author_id: 1
+  revisor_id: 1
+welcome_1:
+  id: 2
+  page_id: 1
+  title: Welcome to the weblg
+  body: Such a lovely day
+  version: 23
+  author_id: 2
+  revisor_id: 2