Merge branch 'master' into 'master'

UCLLStudentApp: update to version 1.0.1 (white screen problem corrected)

See merge request !743
This commit is contained in:
Daniel Martí 2015-04-30 20:25:29 +00:00
commit 6fb0f96bc0

View file

@ -24,9 +24,8 @@ Build:1.0.0,10000
mv bin ant-build mv bin ant-build
Build:1.0.1,10001 Build:1.0.1,10001
disable=white screen commit=26
commit=23 subdir=android
subdir=platforms/android
build=cd CordovaLib && \ build=cd CordovaLib && \
rm build.xml && \ rm build.xml && \
android update project -p . && \ android update project -p . && \