Fix conflict and save as UTF-16 again.

Browse Source

...

This commit is contained in:

The Dax 2013-08-07 04:32:24 -04:00

parent 64f7a9a6ea

commit a391974037

1 changed files with 0 additions and 0 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

BIN

Windows/ppsspp.rc

Binary file not shown.