Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
This commit is contained in:
Luke Dashjr
2012-06-14 18:13:46 +00:00
18 changed files with 49 additions and 27 deletions
+6
View File
@@ -26,3 +26,9 @@ void Shutdown(void* parg)
{
exit(0);
}
void StartShutdown()
{
exit(0);
}