Merge branch 'drop-old-stuff'
commitafce6b68c91d30a3ef61d08f9e0caf50f750c8d8
authorSven Strickroth <email@cs-ware.de>
Sat, 1 Oct 2011 13:53:05 +0000 (1 15:53 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 2 Oct 2011 13:01:14 +0000 (2 15:01 +0200)
tree705469969e81cfd3afb1cbec6282f0c1276e97fd
parent66ccb5ba39b1d178e38642c94b5f6f6565ecc213
parentc57134d21df97c5e5c0b8518ac01c5a18a84c797
Merge branch 'drop-old-stuff'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseShell/ContextMenu.cpp
src/TortoiseShell/Globals.h
src/TortoiseShell/MenuInfo.cpp