diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-23 13:16:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-23 13:16:48 +0200 |
| commit | 38c471bef6ec5b9236ccf3331d982e379d7be4a8 (patch) | |
| tree | 7c92b7e1ab05989b9567d88b9a84062b912f96c3 /platform/android | |
| parent | 21497bd501ff1a6f8029475a1cdf99162c6ca369 (diff) | |
| parent | c7c65ca6bac04925353db9b3bee4b0cd0b634ac6 (diff) | |
Merge pull request #9765 from Noshyaar/pr-clang
Clang-formatting *.cpp and *.h (some files excluded)
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/audio_driver_jandroid.cpp | 2 | ||||
| -rw-r--r-- | platform/android/godot_android.cpp | 2 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index cf1ea169b3..d293f3ed30 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "audio_driver_jandroid.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" #include "thread_jandroid.h" #ifndef ANDROID_NATIVE_ACTIVITY diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index 4e4fd8074c..71db03049a 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -36,9 +36,9 @@ #include <GLES2/gl2.h> #include "file_access_android.h" -#include "project_settings.h" #include "main/main.h" #include "os_android.h" +#include "project_settings.h" #include <android/log.h> #include <android/sensor.h> #include <android/window.h> diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index bd234fa4a2..0508989d2f 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -36,11 +36,11 @@ #include "dir_access_jandroid.h" #include "file_access_android.h" #include "file_access_jandroid.h" -#include "project_settings.h" #include "java_class_wrapper.h" #include "main/input_default.h" #include "main/main.h" #include "os_android.h" +#include "project_settings.h" #include "thread_jandroid.h" #include <unistd.h> |