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)
1  2 
lib/android/ui/native_ui.nit

Simple merge