- Fix trivial conflict between revisions
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@433 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
edd8cc3e95
commit
6446c205ea
|
@ -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<IOManager> 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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue