Merge branch 'dev' into giga-postprocessing

2018-11-15 20:53:30 -03:00 · 2018-11-15 20:53:30 -03:00 · c7e1b5b9ef
commit c7e1b5b9ef
parent 50be3fdb98 8c1286f12a
14 changed files with 99 additions and 50 deletions
--- a/app/src/main/res/menu/mission.xml
+++ b/app/src/main/res/menu/mission.xml
@ -1,5 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
    <item
        android:id="@+id/start"
        android:title="@string/start" />
@ -46,5 +45,4 @@
        </menu>

    </item>
-
 </menu>