summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-07-12 11:11:08 +0200
committerrautenberg <rautenberg@in-silico.ch>2012-07-12 11:11:08 +0200
commitca762835051592eee992d22b022ee62ea040bbb3 (patch)
tree5e725c8d70bdd0ab6caef89045c3d1690431fac0
parent00b1cdfb7a2abe3dee954ed6d22188ec0d064cbd (diff)
parent6a1531edba436adf3c3d1bda9a0e6a4ca27937d3 (diff)
Merge branch 'release/v3.2.0'HEADv4.0.0oldarchmaster
-rw-r--r--ChangeLog2
-rw-r--r--application.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..761104f
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+2012-07-12
+ * switch to opentox-ruby version 4.0.0
diff --git a/application.rb b/application.rb
index fe04547..d9e5df5 100644
--- a/application.rb
+++ b/application.rb
@@ -7,7 +7,7 @@ ENV["CLASSPATH"] = "#{ENV["CLASSPATH"]}:#{java_dir}:#{cdk}:#{jchempaint}"
require 'rubygems'
require 'rjb'
-gem "opentox-ruby", "~> 3"
+gem "opentox-ruby", "~> 4"
require 'opentox-ruby'
before do