Merge branch 'master' of https://github.com/coestergaard/ppsspp into coestergaard-master

Browse Source

Conflicts:
	lang

...

This commit is contained in:

Henrik Rydgard committed 2014-02-10 00:21:39 +01:00

2 parents aae787168e 05529448a7

commit 7bedbcbbb3

1 file changed

+1 -1

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

lang

+1 -1

Submodule lang updated: d01e3b1c9d...35ba4ad4cd.