Merge branch 'master' of github.com:xupefei/Locale-Emulator · xupefei/Locale-Emulator@d4d6349 · GitHub

This repository has been archived by the owner on Apr 15, 2022. It is now read-only.

Commit

Merge branch 'master' of github.com:xupefei/Locale-Emulator

Browse files

Conflicts:
	Docs/changelog.eng.txt
	Docs/changelog.txt

Loading branch information

xupefei committed Apr 23, 2014

2 parents ed4585e + ac8ae73 commit d4d6349