Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						9e946d4c5d 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp 
						
						
					 
					
						2021-11-03 00:45:12 +00:00 
						 
				 
			
				
					
						
							
							
								dP 
							
						 
					 
					
						
						
							
						
						585ad9bcab 
					 
					
						
						
							
							Cleanup: Swap comments for IConsoleModes ( #9587 )  
						
						
						
						
					 
					
						2021-10-02 16:33:28 +02:00 
						 
				 
			
				
					
						
							
							
								rubidium42 
							
						 
					 
					
						
						
							
						
						de49727ae8 
					 
					
						
						
							
							Change: not performing a command is worthy of an error, not a warning  
						
						... 
						
						
						
						If a command cannot be executed for whatever reason, it makes no sense to call it a warning. Something has been done wrong.
Also make writing of these error message consistent while changing their "type". 
						
						
					 
					
						2021-06-13 15:25:31 +02:00 
						 
				 
			
				
					
						
							
							
								S. D. Cloudt 
							
						 
					 
					
						
						
							
						
						13cc8a0cee 
					 
					
						
						
							
							Cleanup: Removed SVN  headers  
						
						
						
						
					 
					
						2019-11-10 17:59:20 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						df16ebd730 
					 
					
						
						
							
							(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style  
						
						
						
						
					 
					
						2011-12-19 17:48:04 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						80591d73c1 
					 
					
						
						
							
							(svn r21707) -Fix [FS#4371]: bit too strict assertion on validness of console colours  
						
						
						
						
					 
					
						2011-01-03 20:54:20 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						b25cf57542 
					 
					
						
						
							
							(svn r21701) -Codechange: ConsoleColour = TextColour, so make it that way and remove some unneeded casts  
						
						
						
						
					 
					
						2011-01-03 12:01:41 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						666fbb28c2 
					 
					
						
						
							
							(svn r21687) -Fix: verify the colour code we received from the server is valid  
						
						
						
						
					 
					
						2011-01-01 17:02:29 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						212dbbf4d8 
					 
					
						
						
							
							(svn r20022) -Doc: Add some doxygen comments.  
						
						
						
						
					 
					
						2010-06-26 15:22:10 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						7fbc33dae1 
					 
					
						
						
							
							(svn r17248) -Fix: add GPL license notice where appropriate  
						
						
						
						
					 
					
						2009-08-21 20:21:05 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						6884f9cb41 
					 
					
						
						
							
							(svn r13229) -Codechange: replace some global variables that are only initialised once and always with the same value with enums.  
						
						
						
						
					 
					
						2008-05-24 10:35:15 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						6c20f77330 
					 
					
						
						
							
							(svn r13228) -Codechange: split console.h.  
						
						
						
						
					 
					
						2008-05-24 10:15:06 +00:00