scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b8e11cf197 
								
							 
						 
						
							
							
								
								Merge commit 'pull/upstream/678' into HEAD  
							
							... 
							
							
							
							Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp 
							
						 
						
							2015-11-13 01:34:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a47617c21f 
								
							 
						 
						
							
							
								
								Fix tab indentations in apps/ and components/  
							
							
							
						 
						
							2015-09-16 20:45:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								8243fb2479 
								
							 
						 
						
							
							
								
								Load methods (for ESM records) accept a deleted flag in ESMTool  
							
							
							
						 
						
							2015-07-22 22:17:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								ede4bfcf52 
								
							 
						 
						
							
							
								
								Rework EsmTool code. Remove explicit NAME handling  
							
							
							
						 
						
							2015-07-19 14:58:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c883a73d30 
								
							 
						 
						
							
							
								
								Several warning fixes  
							
							
							
						 
						
							2015-01-23 15:34:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								bfd79bfbe6 
								
							 
						 
						
							
							
								
								Various fixes for CppCheck warnings.  
							
							... 
							
							
							
							Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com> 
							
						 
						
							2013-12-06 07:36:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Puda 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d5cb4edf 
								
							 
						 
						
							
							
								
								New command line option --plain to print contents of scripts, books, dialogs.  
							
							
							
						 
						
							2013-05-22 20:09:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								918cdcffc2 
								
							 
						 
						
							
							
								
								Split up components/esm/loadlocks  
							
							
							
						 
						
							2013-03-22 05:50:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cfcohen 
								
							 
						 
						
							
							
							
							
								
							
							
								50e259c060 
								
							 
						 
						
							
							
								
								Remove tabs as requested.  Sorry about that, thought I already  
							
							... 
							
							
							
							had. :-) I updated the help to better document the --type option,
although I did not finish reasoning through it's interaction with the
new loading framework. I also expanded the print() methods of a few
more of the record types to make a more consistent commit. 
							
						 
						
							2012-10-09 19:41:45 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cfcohen 
								
							 
						 
						
							
							
							
							
								
							
							
								57f3b50dc8 
								
							 
						 
						
							
							
								
								Add more detail to ESMTool record dumping.  
							
							
							
						 
						
							2012-10-09 01:33:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								721324c1db 
								
							 
						 
						
							
							
								
								rm record inheritance, rework esmtool accordingly  
							
							
							
						 
						
							2012-09-30 23:34:53 +04:00