Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev

Browse Source

...

This commit is contained in:

tterrag1098 committed 2015-04-26 22:04:14 -04:00

2 parents 48aa74714e 756f4dee36

commit 367a604496

1 file changed

+860 -461

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/chisel/lang/zh_CN.lang

+860 -461

File diff suppressed because it is too large. Load diff