Merge branch 'develop' into clean_up
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:10:09 +0000 (17:10 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:10:09 +0000 (17:10 +0100)
commitbb34e0f480f65e3a773df107b5d2267999e463cb
tree02c11edb5a0f43caba6ac7b8b97cbd8de00eb78b
parent4160e7e256cc91479a5ec883db32172a91ea8243
parent0dbb1876fafaa8a1ed8d17d85aec4b29c46d7aab
Merge branch 'develop' into clean_up
25 files changed:
res/values-ca/strings.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values-en-rGB/strings.xml
res/values-es/strings.xml
res/values-et-rEE/strings.xml
res/values-fi-rFI/strings.xml
res/values-fr/strings.xml
res/values-gl/strings.xml
res/values-it/strings.xml
res/values-ja-rJP/strings.xml
res/values-lt-rLT/strings.xml
res/values-mk/strings.xml
res/values-ms-rMY/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rBR/strings.xml
res/values-pt-rPT/strings.xml
res/values-ru-rRU/strings.xml
res/values-ru/strings.xml
res/values-si-rLK/strings.xml
res/values-sk-rSK/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml