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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 2 | ||||
| -rw-r--r-- | drivers/png/resource_saver_png.cpp | 2 | ||||
| -rw-r--r-- | drivers/rtaudio/audio_driver_rtaudio.cpp | 2 | ||||
| -rw-r--r-- | drivers/xaudio2/audio_driver_xaudio2.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 0cb7aa8745..2abdbe9d0a 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -31,8 +31,8 @@ #include "rasterizer_gles2.h" #include "gl_context/context_gl.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" #include "servers/visual/particle_system_sw.h" #include "servers/visual/shader_language.h" #include <stdio.h> diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 42d4572b7f..56d9f2cc47 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "rasterizer_canvas_gles3.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" #include "rasterizer_scene_gles3.h" #include "servers/visual/visual_server_raster.h" #ifndef GLES_OVER_GL diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp index ff3128d476..4f1f318aee 100644 --- a/drivers/png/resource_saver_png.cpp +++ b/drivers/png/resource_saver_png.cpp @@ -30,8 +30,8 @@ #include "resource_saver_png.h" #include "core/image.h" -#include "project_settings.h" #include "os/file_access.h" +#include "project_settings.h" #include "scene/resources/texture.h" #include <png.h> diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp index 4dee796060..da998db66f 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.cpp +++ b/drivers/rtaudio/audio_driver_rtaudio.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "audio_driver_rtaudio.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" #ifdef RTAUDIO_ENABLED diff --git a/drivers/xaudio2/audio_driver_xaudio2.cpp b/drivers/xaudio2/audio_driver_xaudio2.cpp index da6de79592..a1ca2c678e 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.cpp +++ b/drivers/xaudio2/audio_driver_xaudio2.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "audio_driver_xaudio2.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" const char *AudioDriverXAudio2::get_name() const { return "XAudio2"; |