# HG changeset patch
# User Adam Stark <adamstark.uk@gmail.com>
# Date 1416576444 0
# Node ID 73855a26a0e02fecd965eb50f532de3b45a40232
# Parent  2f3906d2d92cff1d04708b338386753290a3e9e7# Parent  7d3622243e9adc2629e70720b327cab409cf20ef
Merge branch 'release/1.0.1'

diff -r 2f3906d2d92c -r 73855a26a0e0 .flow
--- a/.flow	Tue Jul 08 12:32:27 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-[branchname]
-master = master
-develop = develop
-feature = feature/
-release = release/
-hotfix = hotfix/
-support = support/
-
diff -r 2f3906d2d92c -r 73855a26a0e0 .gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Fri Nov 21 13:27:24 2014 +0000
@@ -0,0 +1,9 @@
+python-module/build
+unit-tests/Build
+xcuserdata
+.DS_Store
+
+*.o
+*.dylib
+
+*.xcworkspace
\ No newline at end of file
diff -r 2f3906d2d92c -r 73855a26a0e0 .hgignore
--- a/.hgignore	Tue Jul 08 12:32:27 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-syntax: glob
-
-python-module/build
-unit-tests/Build
-xcuserdata
-.DS_Store
-
-*.o
-*.dylib
-
-*.xcworkspace
\ No newline at end of file
diff -r 2f3906d2d92c -r 73855a26a0e0 README.md
--- a/README.md	Tue Jul 08 12:32:27 2014 +0100
+++ b/README.md	Fri Nov 21 13:27:24 2014 +0000
@@ -1,7 +1,7 @@
 BTrack - A Real-Time Beat Tracker
 =================================
 
-** Version 1.0.0 **
+** Version 1.0.1 **
 
 *by Adam Stark, Matthew Davies and Mark Plumbley.*
 
@@ -21,6 +21,11 @@
 Versions
 --------
 
+==== 1.0.1 ==== (24th November 2014)
+
+* Moved to git & updated README
+* No implementation changes
+
 ==== 1.0.0 ==== (8th July 2014)
 
 * Many updates to stability and improvements to implementation
@@ -85,7 +90,7 @@
 
 **STEP 3.2 - Onset Detection Function Input**	
 
-The algorithm can process onset detection function samples. Given a double precision onset detection function sample called 'newSamples', at each step, call:
+The algorithm can process onset detection function samples. Given a double precision onset detection function sample called 'newSample', at each step, call:
 
 	b.processOnsetDetectionFunctionSample(newSample);