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
d7cddd4e17
VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk.
...
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.
Fix Bazaar diff interaction (find the file on doubleclick).
Introduce initializeDiffEditor to BaseClient and wire the editors
there.
2011-03-28 11:59:26 +02:00
cerf
d23d7cbc12
Bazaar: fix code folding markers in the diff view
...
The top-level marker is now centered on the line starting with '==='
Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-16 17:29:13 +01:00
cerf
2c088f06a0
Bazaar: fix jumping to the changes from the blame view
...
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-16 17:29:12 +01:00
cerf
53ba19a102
Bazaar plugin : corrected whitespaces and indentation
...
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-16 17:29:06 +01:00
cerf
9494352abf
Bazaar: fix code folding markers in the diff view
...
The top-level marker is now centered on the line starting with '==='
Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-14 19:32:42 +01:00
cerf
6971466eaa
Bazaar: fix jumping to the changes from the blame view
...
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-14 17:52:50 +01:00
cerf
2e6a391966
Bazaar plugin : corrected whitespaces and indentation
...
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-03-11 15:32:11 +01:00
cerf
f9bb4c59dc
Added new Bazaar plugin
...
Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-02-28 16:08:38 +01:00
