diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-01-27 18:18:29 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-01-27 18:18:29 +0100 |
| commit | a59432d06412e919d6877f20420e27a72e7536e2 (patch) | |
| tree | ef7d7b25f839254157eae262be50559719a8aa59 | |
| parent | 9400b9abba43cc3a9d2a21d1ab174534de9f9128 (diff) | |
| parent | 98d9e9575396d44ebc40de83e382fe93ded2ccea (diff) | |
Merge remote branch 'mguetlein/development'
Conflicts:
features/compound.feature
features/fminer.feature
features/lazar_single_prediction.feature
features/step_definitions/common_steps.rb
features/step_definitions/fminer_step.rb
features/step_definitions/lazar_steps.rb
features/step_definitions/task_steps.rb
features/support/hooks.rb
0 files changed, 0 insertions, 0 deletions