Merge branch 'master' into print_error
authorAlexis Laferrière <alexis.laf@xymus.net>
Tue, 12 May 2015 12:43:19 +0000 (08:43 -0400)
committerAlexis Laferrière <alexis.laf@xymus.net>
Tue, 12 May 2015 12:43:19 +0000 (08:43 -0400)
commit800ba2188740ba67a6a79115296f9550fe0ddd7e
tree95a15ff7ca6751c996f640bfcbc793419fdd2c22
parentc4d3f7b66cad1af887f6a154b118c2934527ed2b
parentb6213263e817abf5c5898a4ba230a3203c5c8cc7
Merge branch 'master' into print_error
lib/android/android.nit
lib/linux/data_store.nit