merge the two dialog settings pages
commite2330f1ced463751b1881a107f336886621d3ac9
authorSven Strickroth <email@cs-ware.de>
Wed, 7 Dec 2011 23:28:48 +0000 (8 00:28 +0100)
committerSven Strickroth <email@cs-ware.de>
Wed, 7 Dec 2011 23:28:48 +0000 (8 00:28 +0100)
treea4d780b2dd4c961933aa78806890c7aebf2b86a1
parent6e4b6f3c9677909eac9f063265a32bfa92fb5f3c
merge the two dialog settings pages

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Settings/SetDialogs.cpp
src/TortoiseProc/Settings/SetDialogs.h
src/TortoiseProc/Settings/SetMisc.cpp [deleted file]
src/TortoiseProc/Settings/SetMisc.h [deleted file]
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/Settings/Settings.h
src/TortoiseProc/resource.h