]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc3b0d9 729a503)
Merge branch 'divVerent/lhnet_tcp' into IDWMaster/lobby_and_chat_support
authorRudolf Polzer <divverent@xonotic.org>
Tue, 13 Aug 2013 13:33:45 +0000 (15:33 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 13 Aug 2013 13:33:45 +0000 (15:33 +0200)

Trivial merge