diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-05-27 09:09:41 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-05-27 09:09:41 +0200 |
| commit | b04a09d3f35589fea83fce5eecdb5c2c91e9c413 (patch) | |
| tree | 4e2cc2880339309ea7fc4dea433d9a7bc8e6316e /Rakefile | |
| parent | 65eb02eabeb7fece614d93ed4a2dcc9f62867bc5 (diff) | |
| parent | 736b01c045331bb3787bf491bc4c11c222aea206 (diff) | |
Merge branch 'development' into svm_matrix
Conflicts:
lib/model.rb
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions