Just fixing a small SVN conflict, XuN already fixed the problem that caused the compiler to fail and I incorrectly had sent the same fix again :P
Just fixing a small SVN conflict, XuN already fixed the problem that caused the compiler to fail and I incorrectly had sent the same fix again :P

Sphereserver/Source2,azmanomer/Source,Sphereserver/Source,Sphereserver/Source2,drk84/Source,Sphereserver/Source,drk84/Source,azmanomer/Source