Merge remote-tracking branch 'upstream/heads/master' into integration integration
authorBogDan Vatra <bog_dan_ro@yahoo.com>
Sat, 14 Jan 2012 18:29:10 +0000 (20:29 +0200)
committerBogDan Vatra <bog_dan_ro@yahoo.com>
Sat, 14 Jan 2012 18:29:10 +0000 (20:29 +0200)
commit21c717a1c3e91daabf105aed4a0210dbde9f34ac
tree470031131d679e2425d8a53bbcef835ad8a33c9f
parenta07108708a7728614ce0aca317ab73ebce8ed5aa
parent2776346db43fa6835e495637bc262c47e3719bc0
Merge remote-tracking branch 'upstream/heads/master' into integration
src/app/main.cpp
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/coreplugin/mainwindow.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/qt4projectmanager/makestep.h