Skip to content

Commit 91e4f2f

Browse files
committed
Merge branch 'master' into 2.4_Lite
# Conflicts: # data/text/po/czech.po # data/text/po/french.po # data/text/po/german.po # data/text/po/polish.po # data/text/po/portuguese.po # data/text/po/russian.po
2 parents e00ae6e + 0fdc84b commit 91e4f2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2230
-3932
lines changed

data/text/czech/dialog/ncheli.msg

Lines changed: 0 additions & 13 deletions
This file was deleted.

data/text/czech/dialog/ncpitbox.msg

Lines changed: 0 additions & 41 deletions
This file was deleted.

data/text/english/dialog/ncheli.msg

Lines changed: 0 additions & 66 deletions
This file was deleted.

data/text/english/dialog/ncpitbox.msg

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)