| commit | 3fcc3c928b5098f3b379cb23b88e162f1f80ab7c | |
| author | Petr Pavlu <setup@dagobah.cz> | |
| Wed, 29 Mar 2017 20:56:44 +0000 (29 21:56 +0100) | ||
| committer | Petr Pavlu <setup@dagobah.cz> | |
| Wed, 29 Mar 2017 20:56:44 +0000 (29 21:56 +0100) | ||
| tree | 6acf6a5710973b2a9ae3470bdc33cb4dc4a2a1d8 | treesnapshot (tar.gz zip) |
| parent | 6b5f85c822e3192e85517560e7750501aeac6d9d | commitdiff |
| parent | 444138ba64fe6b261c2a82fd7d753b8536fe6d84 | commitdiff |
Merge branch 'smaster' into mob
# Conflicts:
# cppconsui/CMakeLists.txt
# src/Conversations.cpp
# Conflicts:
# cppconsui/CMakeLists.txt
# src/Conversations.cpp
| src/Conversations.cpp | diff1 | diff2 | blobhistory |