Merge branch '1.0.0' into master

Conflicts:
	src/plugins/debugger/gdbengine.cpp
This commit is contained in:
Oswald Buddenhagen
2009-02-23 17:03:25 +01:00
49 changed files with 329 additions and 549 deletions

View File

@@ -63,9 +63,9 @@ const char * const IDE_REVISION_STR = "";
#undef STRINGIFY_INTERNAL
//modes
const char * const MODE_WELCOME = "QtCreator.Mode.Welcome";
const char * const MODE_EDIT = "QtCreator.Mode.Edit";
const char * const MODE_OUTPUT = "QtCreator.Mode.Output";
const char * const MODE_WELCOME = "Welcome";
const char * const MODE_EDIT = "Edit";
const char * const MODE_OUTPUT = "Output";
const int P_MODE_WELCOME = 100;
const int P_MODE_EDIT = 90;
const int P_MODE_OUTPUT = 10;