]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bf8987 729a503)
Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into nitroxis/irc
authornitroxis <nitroxis@wtwrp.de>
Sat, 11 Jan 2014 21:31:03 +0000 (22:31 +0100)
committernitroxis <nitroxis@wtwrp.de>
Sat, 11 Jan 2014 21:31:03 +0000 (22:31 +0100)

Trivial merge