Commit cacbe071 authored by Pavel Vainerman's avatar Pavel Vainerman

Merge remote-tracking branch '1.x/master'

Conflicts: conf/libuniset2.spec include/DelayTimer.h src/Various/UniXML.cc
parents 4b35c8a3 1d6e9ab9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment