From 86b6f67344ee7a81f16697ccb6b9130b24eca5df Mon Sep 17 00:00:00 2001 From: Jakob Voigts <jvoigts@mit.edu> Date: Mon, 21 Mar 2016 21:01:12 -0400 Subject: [PATCH] added note on branches to readme --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 33a5186f1..4f5d6b650 100644 --- a/README.rst +++ b/README.rst @@ -10,6 +10,8 @@ Everything is written in C++, with the help of the Juce_ library. Juce is lightw Installation instructions specific for the plugin GUI can be found here: https://open-ephys.atlassian.net/wiki/display/OEW/Plugin+architecture +The two most important branches are **master**, for stable releases of tested versions, and **development** for newer, less tested versions (pull request belong here). If you don't need the latest features use the master branch or, equivalently, download the binaries. + We recommend reading through the wiki_ before attempting to make any changes. For pull requests look at our guidelines regarding the `different branches`_. If you want to add files to the core GUI, you'll have to do that through the "Introjucer," using the "open-ephys.jucer" file. The Introjucer makefiles are located in the JuceLibraryCode/Introjucer/Builds folder, or as part of the Juce source_. -- GitLab