Merge branch '1660_color_keywords'
commit6fca4b04b0c4f2f50518c3ec7633fd417cce9bc3
authorAndrew Borodin <aborodin@vmail.ru>
Fri, 23 Apr 2010 07:54:46 +0000 (23 11:54 +0400)
committerAndrew Borodin <aborodin@vmail.ru>
Fri, 23 Apr 2010 07:54:46 +0000 (23 11:54 +0400)
tree9da8dd8057a14c35b33cf0ac86b80c527e2dceb7
parent3bfebaacb11eb697cac844640f4a66be3f4e4954
parentb266527c5fe83e80d82013e60cb556feb5e7653c
Merge branch '1660_color_keywords'

* 1660_color_keywords:
  Applied MC indentation policy.
  Ticket #1660: color keyword names unification.