Merge branch 'master' into jgrpp
# Conflicts: # source.list # src/blitter/32bpp_anim.cpp # src/linkgraph/linkgraphjob.cpp # src/order_cmd.cpp # src/vehicle.cpp # src/vehicle_type.h
This commit is contained in:
		@@ -26,7 +26,7 @@ private:
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Stateless, thread safe demand hander. Doesn't do anything but call DemandCalculator.
 | 
			
		||||
 * Stateless, thread safe demand handler. Doesn't do anything but call DemandCalculator.
 | 
			
		||||
 */
 | 
			
		||||
class DemandHandler : public ComponentHandler {
 | 
			
		||||
public:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user