diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-06-17 09:10:20 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-06-17 09:10:20 +0100 |
| commit | 3caf2962cfab80a186a72765ce203bbf7e58c27a (patch) | |
| tree | 16606585f519d801c283a95afb17df93c7bff9da /TimeHACK.Main/obj/Release | |
| parent | 3a8ada000aebbe5de46dce584a5d2b4432ddb5ad (diff) | |
| parent | cfed11508eadd97c31fc9c4968785803b431c993 (diff) | |
| download | histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.tar.gz histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.tar.bz2 histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.zip | |
Updated my fork AGAIN
# Conflicts:
# .vs/TimeHACK/v15/.suo
# TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
# TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
# TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
# TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
# TimeHACK.Main/bin/Release/TimeHACK.Engine.dll
# TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb
# TimeHACK.Main/bin/Release/TimeHACK.application
# TimeHACK.Main/bin/Release/TimeHACK.exe
# TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
# TimeHACK.Main/bin/Release/TimeHACK.pdb
# TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
# TimeHACK.Main/obj/Release/CoreCompileInputs.cache
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
# TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
# TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources
# TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources
# TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources
# TimeHACK.Main/obj/Release/TimeHACK.application
# TimeHACK.Main/obj/Release/TimeHACK.exe
# TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
# TimeHACK.Main/obj/Release/TimeHACK.pdb
Diffstat (limited to 'TimeHACK.Main/obj/Release')
25 files changed, 0 insertions, 0 deletions
diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll Binary files differdeleted file mode 100644 index 8669264..0000000 --- a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 --- a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 --- a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 --- a/TimeHACK.Main/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources b/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources Binary files differdeleted file mode 100644 index 9c67c9e..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.LoadGameDialog.resources b/TimeHACK.Main/obj/Release/TimeHACK.LoadGameDialog.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.LoadGameDialog.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.LoadGameProfileItem.resources b/TimeHACK.Main/obj/Release/TimeHACK.LoadGameProfileItem.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.LoadGameProfileItem.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.NewGameDialog.resources b/TimeHACK.Main/obj/Release/TimeHACK.NewGameDialog.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.NewGameDialog.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win2K.Win2KApps.SurviveTheDay.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win2K.Win2KApps.SurviveTheDay.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win2K.Win2KApps.SurviveTheDay.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewContact.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewContact.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewContact.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewFolder.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewFolder.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewFolder.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources Binary files differdeleted file mode 100644 index 7d689a4..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources Binary files differdeleted file mode 100644 index b88090a..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources Binary files differdeleted file mode 100644 index e710144..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources Binary files differdeleted file mode 100644 index ffc7d5b..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources Binary files differdeleted file mode 100644 index 1a0e724..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources Binary files differdeleted file mode 100644 index 9944ba5..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources b/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources Binary files differdeleted file mode 100644 index 43f5d49..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources +++ /dev/null diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.TestApp.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.TestApp.resources Binary files differdeleted file mode 100644 index 6c05a97..0000000 --- a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.TestApp.resources +++ /dev/null |
