Pull changes in from master

Afr0Games / Project-Dollhouse

A project aiming to rebuild TSO (The Sims Online) from the ground up. Inspired by CorsixTH.

http://www.afr0games.com

116 stars 24 forks source link

Closed riperiperi closed 9 years ago

riperiperi commented 9 years ago

Merge issues to be resolved.

Afr0 commented 9 years ago

O.o Github says request can't be automatically merged.