# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328808405 0
# Node ID 3cc204120431f6b6aa910371a720e05e58dd5928
# Parent  a0e0982a17fec5607a59309b1832c973ec07c99b# Parent  9c418bea7f6a689c21b99131351abc7bd4411329
Merge from branch "bug_386"

diff -r 9c418bea7f6a -r 3cc204120431 extra/README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra/README.txt	Thu Feb 09 17:26:45 2012 +0000
@@ -0,0 +1,35 @@
+
+SMALLbox Version 2.0 alpha
+
+7 February, 2012
+
+Version 1.0 beta of SMALLbox is the release candidate that is distributed 
+for testing and bug fixing purposes. Please send all bugs, requests and suggestions to:
+
+luis.figueira@eecs.qmul.ac.uk
+
+
+---------------------------------------------------------------------------
+
+Copyright (2010): 	Ivan Damnjanovic, Matthew Davies
+			Centre for Digital Music, 
+			Queen Mary University of London
+
+SMALLbox is distributed under the terms of the GNU General Public License 3
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+---------------------------------------------------------------------------
+
+This folder is where all external toolboxes, examples, plugins, etc should be put.
\ No newline at end of file