merge of reband and history...

git init
git fetch https://github.com/pdinc-oss/CipherShed.git
git fetch https://github.com/srguglielmo/CipherShed.git
git checkout -b test b60070f4d0879e277f44d174a163bbb292325fea
git merge 1ca13ed2271d60ba93d40bcc8db17ced8545f172

git rm src/License.html

mv 'CipherShed.sln' 'src/CipherShed.sln'
git rm 'CipherShed.sln'
git rm 'TrueCrypt.sln'
git rm 'src/TrueCrypt.sln'
git add 'src/CipherShed.sln'

mv 'Setup/CipherShed_setup_background.bmp' 'src/Setup/CipherShed_setup_background.bmp'
git rm 'Setup/CipherShed_setup_background.bmp'
git rm 'Setup/TrueCrypt_setup_background.bmp'
git rm 'src/Setup/TrueCrypt_setup_background.bmp'
git add 'src/Setup/CipherShed_setup_background.bmp'

mv 'Setup/CipherShed_setup.bmp' 'src/Setup/CipherShed_setup.bmp'
git rm 'Setup/CipherShed_setup.bmp'
git rm 'Setup/TrueCrypt_setup.bmp'
git rm 'src/Setup/TrueCrypt_setup.bmp'
git add 'src/Setup/CipherShed_setup.bmp'

mv 'Resources/Icons/CipherShed.icns' 'src/Resources/Icons/CipherShed.icns'
git rm 'Resources/Icons/CipherShed.icns'
git rm 'Resources/Icons/TrueCrypt.icns'
git rm 'src/Resources/Icons/TrueCrypt.icns'
git add 'src/Resources/Icons/CipherShed.icns'

mv 'Resources/Icons/CipherShed-48x48.xpm' 'src/Resources/Icons/CipherShed-48x48.xpm'
git rm 'Resources/Icons/CipherShed-48x48.xpm'
git rm 'Resources/Icons/TrueCrypt-48x48.xpm'
git rm 'src/Resources/Icons/TrueCrypt-48x48.xpm'
git add 'src/Resources/Icons/CipherShed-48x48.xpm'

mv 'Resources/Icons/CipherShed-16x16.xpm' 'src/Resources/Icons/CipherShed-16x16.xpm'
git rm 'Resources/Icons/CipherShed-16x16.xpm'
git rm 'Resources/Icons/TrueCrypt-16x16.xpm'
git rm 'src/Resources/Icons/TrueCrypt-16x16.xpm'
git add 'src/Resources/Icons/CipherShed-16x16.xpm'

mv 'Release/Setup Files/CipherShed User Guide.pdf' 'src/Release/Setup Files/CipherShed User Guide.pdf'
git rm 'Release/Setup Files/CipherShed User Guide.pdf'
git rm 'Release/Setup Files/TrueCrypt User Guide.pdf'
git rm 'src/Release/Setup Files/TrueCrypt User Guide.pdf'
git add 'src/Release/Setup Files/CipherShed User Guide.pdf'

mv 'Main/Forms/CipherShed.fbp' 'src/Main/Forms/CipherShed.fbp'
git rm 'Main/Forms/CipherShed.fbp'
git rm 'Main/Forms/TrueCrypt.fbp'
git rm 'src/Main/Forms/TrueCrypt.fbp'
git add 'src/Main/Forms/CipherShed.fbp'

mv 'Format/CipherShed_Wizard.bmp' 'src/Format/CipherShed_Wizard.bmp'
git rm 'Format/CipherShed_Wizard.bmp'
git rm 'Format/TrueCrypt_Wizard.bmp'
git rm 'src/Format/TrueCrypt_Wizard.bmp'
git add 'src/Format/CipherShed_Wizard.bmp'

mv 'Common/CipherShed_mounted.ico' 'src/Common/CipherShed_mounted.ico'
git rm 'Common/CipherShed_mounted.ico'
git rm 'Common/TrueCrypt_mounted.ico'
git rm 'src/Common/TrueCrypt_mounted.ico'
git add 'src/Common/CipherShed_mounted.ico'

mv 'Common/CipherShed_Volume.ico' 'src/Common/CipherShed_Volume.ico'
git rm 'Common/CipherShed_Volume.ico'
git rm 'Common/TrueCrypt_Volume.ico'
git rm 'src/Common/TrueCrypt_Volume.ico'
git add 'src/Common/CipherShed_Volume.ico'

mv 'Common/CipherShed.ico' 'src/Common/CipherShed.ico'
git rm 'Common/CipherShed.ico'
git rm 'Common/TrueCrypt.ico'
git rm 'src/Common/TrueCrypt.ico'
git add 'src/Common/CipherShed.ico'

git commit -F .git/COMMIT_EDITMSG

git blame HEAD -- src/Main/Forms/CipherShed.fbp | cut -c 1-8 | sort –u

git blame b60070f4d0879e277f44d174a163bbb292325fea -- src/Main/Forms/TrueCrypt.fbp | cut -c 1-8 | sort –u