merge lunixbochs/uberserver & springrts repo

lunixbochs / uberserver

matchmaking/chat lobby server for the spring rts project

MIT License

8 stars 4 forks source link

Closed abma closed 11 years ago

abma commented 11 years ago

sorry that i commited under your name :-/

feel free to revert stuff, but this step was really neded to get everything into one repo again.

springrts repo and your repo had diverged...

lunixbochs commented 11 years ago

You can rewrite author, and Licho's changes are really not canonical. That's why the repos diverged.

abma commented 11 years ago

i guess i'll create a fork as it seems it can't be merged...