Oswald Buddenhagen
|
dc3c156cac
|
Merge branch '2.2'
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
|
2011-04-14 12:39:31 +02:00 |
|
hjk
|
8397663964
|
Update license.
|
2011-04-13 11:49:28 +02:00 |
|
Friedemann Kleint
|
58111b2df2
|
API Documentation: Add VCSBase.
|
2011-03-28 14:19:17 +02:00 |
|
con
|
d1023c7614
|
It's 2011 now.
Reviewed-by: hjk
|
2011-01-12 09:46:24 +01:00 |
|
con
|
04e32b0049
|
License headers.
|
2010-12-17 16:03:42 +01:00 |
|
Roberto Raggi
|
8acde74d79
|
Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
|
2010-07-09 14:47:18 +02:00 |
|
hjk
|
9595504bda
|
Long live the king!
|
2010-03-05 11:28:13 +01:00 |
|
hjk
|
93cbef8724
|
long live the king
|
2009-08-14 09:30:56 +02:00 |
|
Jason McDonald
|
884b7af769
|
Update license headers and sales contact details.
Reviewed-by: Trust Me
|
2009-06-17 00:01:27 +10:00 |
|
hjk
|
8ca887aae2
|
Fixes: change file license headers to include LGPL
|
2009-02-25 09:15:00 +01:00 |
|
Daniel Molkentin
|
59affcfffc
|
Bump year in licence header.
|
2009-01-13 19:22:14 +01:00 |
|
hjk
|
da3cb14483
|
chancge Nokia GPL exception version from 1.2 to 1.3
|
2008-12-16 17:20:00 +01:00 |
|
Eskil Abrahamsen Blomfeldt
|
0fcb8131bd
|
Compile on MSVC 2003
Help the compiler pick the correct overload for the call to pow().
|
2008-12-03 10:16:16 +01:00 |
|
hjk
|
cf11b69643
|
more code cosmetics
|
2008-12-02 16:19:05 +01:00 |
|
hjk
|
ab83dcd87c
|
off-by-one in headers
|
2008-12-02 14:20:25 +01:00 |
|
hjk
|
8a43d9b9f3
|
end-of-line whitespace correction of the new headers
|
2008-12-02 14:17:16 +01:00 |
|
con
|
05c35356ab
|
Initial import
|
2008-12-02 12:01:29 +01:00 |
|