diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:32 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:32 +0100 |
| commit | 0a7c2d4dc020b58dacf1d0cf50403d101f176d72 (patch) | |
| tree | a27d8aa1874c65fa7c72e9e330d04db6f0af6963 | |
| parent | a8bf32646b66951eef7f2e8477d83d4d3f013a87 (diff) | |
| download | histacom2-0a7c2d4dc020b58dacf1d0cf50403d101f176d72.tar.gz histacom2-0a7c2d4dc020b58dacf1d0cf50403d101f176d72.tar.bz2 histacom2-0a7c2d4dc020b58dacf1d0cf50403d101f176d72.zip | |
Trying to fix conficts II
| -rw-r--r-- | .vs/TimeHACK/v15/.suo | bin | 162816 -> 163328 bytes | |||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.cs | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo Binary files differindex 196d511..1448558 100644 --- a/.vs/TimeHACK/v15/.suo +++ b/.vs/TimeHACK/v15/.suo diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 63c493a..1e68101 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -158,7 +158,7 @@ namespace TimeHACK.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Notepad wp = new Win95Notepad(); + WinClassicNotepad wp = new WinClassicNotepad(); WinClassic app = wm.startWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); |