Commit graph

8 commits

Author SHA1 Message Date
Simon Cruanes
e69ad8a6de Merge branch 'master' into stable 2016-04-22 23:42:29 +02:00
Simon Cruanes
42c912fe0e Merge branch 'master' into stable for 0.15 2015-12-22 10:38:21 +01:00
Simon Cruanes
844d39c826 Merge branch 'master' into stable; version 0.13 2015-09-23 16:40:38 +02:00
Simon Cruanes
4e49e2a893 Merge branch 'master' into stable 2015-07-16 11:28:19 +02:00
Simon Cruanes
7bacac2c98 Merge branch 'master' into stable; oasis setup; 0.11 2015-05-24 21:52:22 +02:00
Simon Cruanes
e268f2d10c Merge branch 'master' into stable for 0.10 2015-04-10 16:43:16 +02:00
Simon Cruanes
8054a9f256 version 0.9 (merge from master) 2015-02-27 14:41:09 +01:00
Simon Cruanes
a8f5c3420f merge from master for 0.7 2014-12-19 20:23:13 +01:00