summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-08-05 12:55:58 +0200
committerChristoph Helma <helma@in-silico.ch>2010-08-05 12:55:58 +0200
commitb92d78620f7e9ed3a35730f867019723f51c4462 (patch)
tree1aab98345f8802edebdaf976748bf62f94aef641 /VERSION
parent34a7b50fb278fc37c937f2fe170b86332eb054c5 (diff)
parent9d2f25cdfc340bc7d9df7a041a5b23c1552c7d53 (diff)
Merge commit 'mguetlein/test' into development
Conflicts: lib/owl.rb
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions