Merged minetest-delta a624fe549bc75855a170

.hgtags

 c37bcfd89dd627fdb131ae3f77fcaab02721bf76 working
+69547bd6be420eb40f55524fd2131cbbaa2e0e29 110107195706-exp
+e3c3c8e27bbc8c9b61710517a78944deb1c61696 110211211322
+23880c78e40c50ad54fcd8844510f7a423b37f2a 110212200513
+20c49c98c92a62df457b773c562df41d4167492b 110214175330
+10be2b71f965585af90af96903e83b4ddff52bf9 20110424_0
+9b05d4bfee9312aef4182fa6f63b4237368cec34 0.2.20110529_0
+6fa0a8b40406aa567f8fa84b5e2045a7e3762c1d 0.2.20110529_1
+cf6dd618ef0b7514c81ae87749733b5a328fc763 0.2.20110529_2
+96efc17b4cd92aacbe947b520a6ba91727d42f03 0.2.20110602_0
+0000000000000000000000000000000000000000 0.2.20110602_0
+6f17cd3f6c5481e6abc906fc441980c764632cbc 0.2.20110602_0
+dd08a9b5cb84d55b7576bb3fde3068dd263bc3bc 0.2.20110618_0_dev
+25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
+25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
+0000000000000000000000000000000000000000 0.2.20110704_0
+0000000000000000000000000000000000000000 0.2.20110704_0
+65263ec55caf526e3f3e0bdc6657ce42daee46bc 0.2.20110704_0

src/client.cpp

@@ -932,6 +932,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		*/
 
 		//m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
+		
 		/*
 			Add it to mesh update queue and set it to be acknowledged after update.
 		*/

src/main.cpp

@@ -1060,6 +1060,7 @@ int main(int argc, char *argv[])
 	std::locale::global(std::locale("C"));
 	// This enables printing all characters in bitmap font
 	setlocale(LC_CTYPE, "en_US");
+
 	/*
 		Parse command line
 	*/
@@ -1350,9 +1351,9 @@ int main(int argc, char *argv[])
 	
 	// Set device in game parameters
 	device = device;
-
-	// Set the window caption
-	device->setWindowCaption(L"Minetest [Main Menu]");
+
+	// Set the window caption
+	device->setWindowCaption(L"Minetest [Main Menu]");
 	
 	// Create time getter
 	g_timegetter = new IrrlichtTimeGetter(device);