diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
| commit | a8bf32646b66951eef7f2e8477d83d4d3f013a87 (patch) | |
| tree | 2659eea01895a4077c743aed399aff5631ba9b46 /TimeHACK.Main/OS | |
| parent | e557e46076e0fe44fb03633665ae40c7d7444461 (diff) | |
| parent | 93c445239c7d28a6cee7147d7b6dbe3c7f0974f9 (diff) | |
| download | histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.gz histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.bz2 histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.zip | |
Trying to fix the conflicts
Diffstat (limited to 'TimeHACK.Main/OS')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs (renamed from TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs) | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs (renamed from TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs) | 4 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.resx (renamed from TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.resx) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 26ad12b..2e24af2 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -19,7 +19,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { int chat_index = 0; WindowManager wm = new WindowManager(); - WCMessageParser wcmp = new WCMessageParser(); + MessageParser wcmp = new MessageParser(); bool correctname = false; bool guessing = false; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs index 1355c93..d59f803 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs @@ -1,6 +1,6 @@ namespace TimeHACK.OS.Win95.Win95Apps { - partial class Win95Notepad + partial class WinClassicNotepad { /// <summary> /// Required designer variable. diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index 390614d..24525ea 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -11,9 +11,9 @@ using TimeHACK.Engine; namespace TimeHACK.OS.Win95.Win95Apps { - public partial class Win95Notepad : UserControl + public partial class WinClassicNotepad : UserControl { - public Win95Notepad() + public WinClassicNotepad() { InitializeComponent(); foreach (ToolStripMenuItem item in menuStrip1.Items) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.resx index d5494e3..d5494e3 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.resx |