Merge branch 'mob' of git+ssh://repo.or.cz/srv/git/centerim5 into mob
commit6b5f85c822e3192e85517560e7750501aeac6d9d
authorPetr Pavlu <setup@dagobah.cz>
Wed, 29 Mar 2017 20:45:01 +0000 (29 21:45 +0100)
committerPetr Pavlu <setup@dagobah.cz>
Wed, 29 Mar 2017 20:45:01 +0000 (29 21:45 +0100)
treeaf582a005bcdd673060ab5d97a0a5cde326ce4d4
parenta940882dfaf94adc6204d16e2877165a0e0d5570
parentefdac604e278246df57be147e763f9f143f807cc
Merge branch 'mob' of git+ssh://repo.or.cz/srv/git/centerim5 into mob
cppconsui/CMakeLists.txt
cppconsui/VerticalLine.h
src/CMakeLists.txt
src/CenterIM.cpp
src/Conversation.h
src/Conversations.h
src/Makefile.am