Merge branch 'gpg'
commit5ae4b55977b9dfd8a12f0d103a49807b7b803446
authorSven Strickroth <email@cs-ware.de>
Wed, 14 Aug 2013 18:14:16 +0000 (14 20:14 +0200)
committerSven Strickroth <email@cs-ware.de>
Wed, 14 Aug 2013 18:14:16 +0000 (14 20:14 +0200)
tree2f9108427a186e9a6bb89fc9a91957ea462d0edd
parent7f430061fa0a3ab47ab9191a447cb91bcf35f2b5
parentb6664fedd1706fbff4904755b1e04744e5bfe206
Merge branch 'gpg'
src/Resources/TortoiseProcENG.rc