Mercurial > hg > nnls-chroma

changeset 67:38d2be4413a1 matthiasm-plugin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolved merge
author Matthias Mauch <mail@matthiasmauch.net>
date Tue, 26 Oct 2010 20:48:10 +0900
parents 611a3cfab5fc (current diff) c5307a69beb1 (diff)
children 1d2f3a3f6761
files README nnls_chroma.txt
diffstat 4 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Tue Oct 26 20:48:10 2010 +0900
@@ -0,0 +1,2 @@
+12fd1d3ccd6e0072fc4be295e7a1e383e84912a1 0.1
+12fd1d3ccd6e0072fc4be295e7a1e383e84912a1 0.1
--- a/README	Tue Oct 26 20:37:54 2010 +0900
+++ b/README	Tue Oct 26 20:48:10 2010 +0900
@@ -1,7 +1,11 @@
 ### NNLS Chroma ###
 
 System identifier – vamp:nnls-chroma:nnls-chroma
+<<<<<<< local
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#nnls-chroma 
+=======
+RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#nnls-chroma
+>>>>>>> other
 
 #### General Description ####
 
@@ -34,7 +38,11 @@
 ### Chordino ###
 
 System identifier – vamp:nnls-chroma:chordino
+<<<<<<< local
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino 
+=======
+RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino
+>>>>>>> other
 
 #### General Description ####
 
@@ -60,7 +68,11 @@
 ### Tuning ###
 
 System identifier – vamp:nnls-chroma:tuning
+<<<<<<< local
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#tuning 
+=======
+RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#tuning
+>>>>>>> other
 
 #### General Description ####
 
--- a/nnls-chroma.n3	Tue Oct 26 20:37:54 2010 +0900
+++ b/nnls-chroma.n3	Tue Oct 26 20:48:10 2010 +0900
@@ -18,7 +18,7 @@
     vamp:available_plugin plugbase:chordino ; 
     vamp:available_plugin plugbase:nnls-chroma ; 
     vamp:available_plugin plugbase:tuning ;  
-    foaf:page <http://www.isophonics.net/> ;
+    foaf:page <http://www.isophonics.net/nnls-chroma> ;
     foaf:page <http://www.omras2.org/> ;
     foaf:page <http://www.matthiasmauch.net/> ; 
     .
--- a/nnls_chroma.txt	Tue Oct 26 20:37:54 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-basschroma.n3
-bothchroma.n3
-chroma.n3
-inconsistency.n3
-inconsistencysegment.n3
-localtuning.n3
-logfreqspec.n3
-semitonespectrum.n3
-simplechord.n3
-tunedlogfreqspec.n3
-tuning.n3