Merge branch 'stable-1.2'

# Conflicts:
#	cmake/linux/package_linux.sh.in
#	data/locale/cs.ts
This commit is contained in:
Hyunjin Song
2018-08-24 09:50:36 +09:00
18 changed files with 62 additions and 56 deletions

View File

@@ -80,6 +80,7 @@ protected:
inline QByteArray readAllData()
{
m_file.seek(0);
return m_file.readAll();
}