Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 09:46:20 +0000 (10:46 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 09:46:20 +0000 (10:46 +0100)
commit4ec9f8ca4c4d1b5ddd495a76b936796f39b91102
treecdd6ebed286a80f94ef6f446f69c88068f9744b5
parentf65c57fa5c1568e8013a7d888a5a4be7123edd7b
parentae2b6b1bbe07797bdefdf556499b6d470060117f
Merge branch 'develop' into unify_derivative_views