# HG changeset patch
# User Matthias Mauch <mail@matthiasmauch.net>
# Date 1288093690 -32400
# Node ID 38d2be4413a138be32297c2b41381ada4eb6c55f
# Parent  611a3cfab5fc70bc31464d58f57f1499cb8ecf96# Parent  c5307a69beb1b176fda4e60573705f2c16389409
resolved merge

diff -r 611a3cfab5fc -r 38d2be4413a1 .hgtags
--- /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
diff -r 611a3cfab5fc -r 38d2be4413a1 README
--- 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 ####
 
diff -r 611a3cfab5fc -r 38d2be4413a1 nnls-chroma.n3
--- 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/> ; 
     .
diff -r 611a3cfab5fc -r 38d2be4413a1 nnls_chroma.txt
--- 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