Commit 4b476035 authored by Pavel Vainerman's avatar Pavel Vainerman

Merge branch 'master' of git.eter:/projects/asu/uniset2

Conflicts: conf/libuniset2.spec extensions/UNetUDP/tests/test_unetudp.cc extensions/lib/UObject_SK.cc
parents ce2e1d12 2b379b66
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