feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'origin/1.3' (early part)

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:14:44 +01:00
parent 3afe252e1f 07da7ccfdf
commit 4320314046
6 changed files with 220 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreconstants.h
View File

@@ -48,7 +48,7 @@ namespace Constants {
const char * const IDE_VERSION_LONG = IDE_VERSION;
const char * const IDE_AUTHOR = "Nokia Corporation";
const char * const IDE_YEAR = "2009";
const char * const IDE_YEAR = "2010";
#ifdef IDE_REVISION
const char * const IDE_REVISION_STR = STRINGIFY(IDE_REVISION);