diff options
author | ot1 <andreas@maunz.de> | 2011-11-16 10:42:09 +0100 |
---|---|---|
committer | ot1 <andreas@maunz.de> | 2011-11-16 10:42:09 +0100 |
commit | 361e1aaf080288a6ce64b73eb1c16fa17c191962 (patch) | |
tree | 1bf9b0f44b35e6210751d785ee626436d782e9dc | |
parent | 4c578f36fded69cfe49fd00f6dea8013a6cba4bd (diff) | |
parent | 3246032fbd4b04b1e944bf6d2239dec5c48872f2 (diff) |
Merge branch 'development' of github.com:opentox/install into development
Conflicts:
config.sh
-rwxr-xr-x | config.sh | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -7,8 +7,7 @@ # 1) Base setup OT_DIST="debian" # Linux distribution (debian) OT_INSTALL="local" # Type (gem, local, server) -OT_BRANCH="development" # Maturity (development, master) -# NOTE: For branches other than 'master' you have to have your public SSH key at Github and must be a member of 'opentox-ruby' group. +OT_BRANCH="development" # Maturity (development -you need SSH key at Github-, master) # 2) Where all binaries are installed. OT_PREFIX="$HOME/opentox-ruby" |