summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/language.cpp
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/emu/language.cpp
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/emu/language.cpp')
-rw-r--r--src/emu/language.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/language.cpp b/src/emu/language.cpp
index 23a2d251fab..b47605f50c8 100644
--- a/src/emu/language.cpp
+++ b/src/emu/language.cpp
@@ -2,9 +2,9 @@
// copyright-holders:Miodrag Milanovic
/***************************************************************************
- language.cpp
+ language.cpp
- Multi-language support.
+ Multi-language support.
***************************************************************************/
@@ -75,4 +75,4 @@ void load_translation(emu_options &m_options)
}
global_free_array(buffer);
}
-} \ No newline at end of file
+}