[CST] Focus a44ddd82ad fix conflicts:
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
2012-07-12 12:53:53 +04:00
2012-07-12 12:53:53 +04:00
2012-07-09 09:26:37 +02:00
2012-07-12 12:53:53 +04:00
2009-12-08 11:05:11 +00:00
2009-12-08 11:18:17 +00:00

The file is empty.
Languages
C++ 85%
C 12.5%
Shell 0.6%
Makefile 0.6%
M4 0.5%
Other 0.7%