Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								b74b274ac0
								
							
						 | 
						
							
							
								
								Removed validator for filenames in OpenMW-CS (Fixes #2918)
							
							
							
							
							
						 | 
						
							2015-11-21 12:14:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a445683312
								
							
						 | 
						
							
							
								
								Merge branch 'mergetool'
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp 
							
						 | 
						
							2015-09-11 13:22:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								67bd6cd708
								
							
						 | 
						
							
							
								
								Remove empty line at the beginning of files
							
							
							
							
							
							
							
							git ls-files -z | xargs -0 sed -i '1{/^$/d}'
							
						 | 
						
							2015-08-18 23:06:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								b83f9445a9
								
							
						 | 
						
							
							
								
								added UI for merge tool (merge tool itself is still missing)
							
							
							
							
							
						 | 
						
							2015-08-06 12:52:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cc9cii
								
							 
						 | 
						
							
							
							
							
								
							
							
								faac91472c
								
							
						 | 
						
							
							
								
								Allow '-' and '_' in new addon name.  Resolves Bug #1789.
							
							
							
							
							
						 | 
						
							2014-09-10 23:30:42 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9591ddda6
								
							
						 | 
						
							
							
								
								Reimplemented constentselector view class
							
							
							
							
							
						 | 
						
							2013-10-22 21:52:35 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								00c78a4aa1
								
							
						 | 
						
							
							
								
								Implementing ContentSelector class in DataFilesPage
							
							
							
							
							
							
							
							Moved AdjusterWidget / FileWidget to ContentSelectorView 
							
						 | 
						
							2013-10-01 21:29:45 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								513f0c4b3e
								
							
						 | 
						
							
							
								
								Implemented file/adjuster widgets into new addon creation dialog
							
							
							
							
							
						 | 
						
							2013-09-22 23:52:53 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9f14449eb
								
							
						 | 
						
							
							
								
								added AdjusterWidget
							
							
							
							
							
						 | 
						
							2013-09-10 16:45:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								25b7cd33ea
								
							
						 | 
						
							
							
								
								added FileWidget; fixed OpenCS configuration
							
							
							
							
							
						 | 
						
							2013-09-08 14:31:20 +02:00 | 
						
						
							
							
							
								
							
							
						 |