From 6446c205ea822faf62fd7b9f546ca76407bd7e7a Mon Sep 17 00:00:00 2001 From: tchernobog Date: Fri, 24 Feb 2006 10:07:47 +0000 Subject: [PATCH] - Fix trivial conflict between revisions git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@433 3ecf2c5c-341e-0410-92b4-d18e462d057c --- src/testsuite/test-python_loader.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/testsuite/test-python_loader.cc b/src/testsuite/test-python_loader.cc index ffbcb17..b91be54 100644 --- a/src/testsuite/test-python_loader.cc +++ b/src/testsuite/test-python_loader.cc @@ -28,7 +28,6 @@ #include "backend/schedulable_list.hh" #include "backend/scheduler.hh" #include "standard_io.hh" -#include "start_gui.hh" #include "text_simulation.hh" #include "templates/smartp.hh" @@ -77,9 +76,6 @@ main(int argc, char** argv) { memory::smart_ptr io(new StandardIO()); text_sim.add_io_device(io); text_sim.update(); - - //grafical IO - - // I didn't add a GraphicalTerminalIO, so why do I get a bloody one?? - start_gui(argc, argv, text_sim); + text_sim.run(); + exit(0); }