Merge branch 'android_branch' into android_translate

Browse source

Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml

...

This commit is contained in:

Eric House 2015-08-17 07:05:58 -07:00

parent d6d1bbe2e0 cbe2c6f5f3

commit 6ae73ab99b

2 changed files with 41 additions and 41 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files