Merge branch 'master' into android-annotations
authorAlexis Laferrière <alexis.laf@xymus.net>
Tue, 12 May 2015 12:44:45 +0000 (08:44 -0400)
committerAlexis Laferrière <alexis.laf@xymus.net>
Tue, 12 May 2015 12:44:45 +0000 (08:44 -0400)
commit4249a1381af4a013533f5010e16848dfabd02e20
tree171bb20f47a421fcf548ea272b028e77f078f44f
parentc11abcc5332a63c8cb995840e31af316a3ce83e2
parentb6213263e817abf5c5898a4ba230a3203c5c8cc7
Merge branch 'master' into android-annotations
lib/android/ui/native_ui.nit