fix conflicts:

Browse Source

adding hints is work in progress, so until most is finished,
please avoid sorting locals.h, locals_intern.h, english.locale.
to resolve i had to sort (real, case-insensitive) this files


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d513d963
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)



------------------
This commit was generated by Migit

...

This commit is contained in:

[CST] Focus

2012-07-12 12:53:53 +04:00

parent da715dc755 4b99cb5774

commit a44ddd82ad

10 changed files with 1492 additions and 1298 deletions

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

777

src/system/locals_intern.h

File diff suppressed because it is too large Load Diff