Merge branch 'new-temp-dir' of git://github.com/ch3cooli/TortoiseGit
commit76e3e46657cebedd874276115a767f9c82e7d100
authorSven Strickroth <email@cs-ware.de>
Thu, 29 Nov 2012 17:49:46 +0000 (29 18:49 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 29 Nov 2012 18:04:32 +0000 (29 19:04 +0100)
treee0c693de1174ddbd6d7ccc9f960129c90caefca5
parent704c23a03c0448809772bce672aa3b9331de29e7
parent219cba60ac916bc8fa1370700755ec731cc60194
Merge branch 'new-temp-dir' of git://github.com/ch3cooli/TortoiseGit

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Languages/Tortoise.pot
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Settings/SetSavedDataPage.cpp
src/TortoiseProc/resource.h