aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Main/Program.cs
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-11-17 20:29:46 -0700
committerAShifter <[email protected]>2017-11-17 20:29:46 -0700
commitebdc09fe679b4b06fd149c8fc6539244100ce896 (patch)
tree65dfe45bbfd194ddb534cc80107ab8e6d80cf5bc /ShiftOS.Main/Program.cs
parent1d0b393e6969d9671daead8049973a374421046f (diff)
parent97722fbe9d474adffbba0b92e9727c48a8205234 (diff)
downloadshiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.tar.gz
shiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.tar.bz2
shiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.zip
Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'
Diffstat (limited to 'ShiftOS.Main/Program.cs')
-rw-r--r--ShiftOS.Main/Program.cs31
1 files changed, 14 insertions, 17 deletions
diff --git a/ShiftOS.Main/Program.cs b/ShiftOS.Main/Program.cs
index 10277b0..f7c00eb 100644
--- a/ShiftOS.Main/Program.cs
+++ b/ShiftOS.Main/Program.cs
@@ -1,24 +1,21 @@
using System;
-using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Main.ShiftOS;
namespace ShiftOS.Main
{
- static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- static void Main()
- {
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
+ static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
- Parallel.Invoke(
- () => Application.Run(new TestForm()),
- () => Application.Run(new Desktop()));
- }
- }
-}
+ Application.Run(new Desktop());
+ }
+ }
+} \ No newline at end of file