Merge branch '1.0.0' into master-master

Conflicts:
	src/plugins/debugger/debugger.pro
	src/plugins/debugger/gdbengine.cpp
This commit is contained in:
Oswald Buddenhagen
2009-02-24 15:15:39 +01:00
42 changed files with 138 additions and 126 deletions

View File

@@ -37,9 +37,9 @@
namespace Core {
namespace Constants {
#define IDE_VERSION_MAJOR 0
#define IDE_VERSION_MINOR 9
#define IDE_VERSION_RELEASE 2
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 0
#define IDE_VERSION_RELEASE 0
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)