 Petr Vanek
|
520661ab6f
|
Merge branch 'master' of file:///export/home/pvanek/oss/qterm/merge/qtermwidget
Conflicts:
lib/BlockArray.cpp
lib/BlockArray.h
lib/CMakeLists.txt
lib/Character.h
lib/CharacterColor.h
lib/Emulation.cpp
lib/Emulation.h
lib/Filter.cpp
lib/Filter.h
lib/History.cpp
lib/History.h
lib/KeyboardTranslator.cpp
lib/KeyboardTranslator.h
lib/Pty.cpp
lib/Pty.h
lib/Screen.cpp
lib/Screen.h
lib/ScreenWindow.cpp
lib/ScreenWindow.h
lib/Session.cpp
lib/Session.h
lib/ShellCommand.cpp
lib/ShellCommand.h
lib/TerminalCharacterDecoder.cpp
lib/TerminalCharacterDecoder.h
lib/TerminalDisplay.cpp
lib/TerminalDisplay.h
lib/Vt102Emulation.cpp
lib/Vt102Emulation.h
lib/k3process.cpp
lib/k3process.h
lib/k3processcontroller.cpp
lib/k3processcontroller.h
lib/konsole_wcwidth.cpp
lib/konsole_wcwidth.h
lib/kpty.cpp
lib/kpty.h
lib/kpty_p.h
lib/qtermwidget.cpp
lib/qtermwidget.h
|
2010-10-04 11:29:18 +02:00 |
|