Merge branch '1.1'

Conflicts:
	src/plugins/debugger/debuggeractions.cpp

Reviewed-by: hjk
This commit is contained in:
Thorbjørn Lindeijer
2009-04-16 11:20:52 +02:00
36 changed files with 716 additions and 287 deletions

View File

@@ -77,7 +77,6 @@ enum DebuggerActionCode
AdjustColumnWidths,
AlwaysAdjustColumnWidths,
AutoQuit,
TerminalApplication,
LockView,
// Gdb