Merge branch 'prop-page-crash'
commit950fa54307d2742499794ebaeead0c83981ea6e1
authorSven Strickroth <email@cs-ware.de>
Sun, 13 Jan 2013 17:34:24 +0000 (13 18:34 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 13 Jan 2013 17:34:24 +0000 (13 18:34 +0100)
treead55acae7c6597abb654594bbba8b261efe2fb03
parentde225ff3a4774b294a30f13836a3fa64d6231848
parent38470a488aa882f9942f88e2296dad4afb527a46
Merge branch 'prop-page-crash'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Languages/Tortoise.pot
src/TortoiseShell/resourceshell.rc