Mercurial > hg > soundsoftware-site
annotate .svn/pristine/11/114bca33e13814e69bb30791d00e3851d89cb11c.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 |
| rev | line source |
|---|---|
| Chris@909 | 1 documents_001: |
| Chris@909 | 2 created_on: 2007-01-27 15:08:27 +01:00 |
| Chris@909 | 3 project_id: 1 |
| Chris@909 | 4 title: "Test document" |
| Chris@909 | 5 id: 1 |
| Chris@909 | 6 description: "Document description" |
| Chris@909 | 7 category_id: 1 |
| Chris@909 | 8 documents_002: |
| Chris@909 | 9 created_on: 2007-02-12 15:08:27 +01:00 |
| Chris@909 | 10 project_id: 1 |
| Chris@909 | 11 title: "An other document" |
| Chris@909 | 12 id: 2 |
| Chris@909 | 13 description: "" |
| Chris@909 | 14 category_id: 1 |