diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
| commit | 2a877dcf06389fdc1dcd65e9c56562eb3a0787f0 (patch) | |
| tree | 89d311474a357955269c975ccbc5a6abf8b2b1a9 /include/delphi/m_history.inc | |
| parent | 072bfe7969fded36f765cc14185879ccbc90c8b6 (diff) | |
| parent | 38e45092ed0f39dd347e33833f74fafd51d94597 (diff) | |
Merge remote-tracking branch 'origin/master' into jabber_test
Conflicts:
protocols/JabberG/src/jabber_util.cpp
Diffstat (limited to 'include/delphi/m_history.inc')
0 files changed, 0 insertions, 0 deletions