summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/sdlglcontext.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/osd/modules/render/sdlglcontext.h
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/osd/modules/render/sdlglcontext.h')
-rw-r--r--src/osd/modules/render/sdlglcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/modules/render/sdlglcontext.h b/src/osd/modules/render/sdlglcontext.h
index 27c0bbe68a6..5a284ef289d 100644
--- a/src/osd/modules/render/sdlglcontext.h
+++ b/src/osd/modules/render/sdlglcontext.h
@@ -64,4 +64,4 @@ private:
char m_error[256];
};
-#endif // __SDL_GL_CONTEXT__ \ No newline at end of file
+#endif // __SDL_GL_CONTEXT__