Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 30 Sep 2009 15:48:52 +0000 (17:48 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 30 Sep 2009 15:48:52 +0000 (17:48 +0200)
commit2e16dff13d260e8ba07534b36ac635c9e625e442
tree31f43e71ce3bb3bdb372f23850b64e5a5afa72c6
parent12eae101aa19fd7a4c7862188c16134ca51f3fd4
parent3b8c67a07acd049035ac67c6ff981939f357473c
Merge branch '4.5' into 4.6
tools/linguist/shared/xliff.cpp