arne krüger
							
						 
					 | 
					
						
						
							
						
						85f4fcf7ae
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport
						
						
						
						
						
						
						
						# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts 
						
						
					 | 
					
						2018-03-09 19:01:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arne krüger
							
						 
					 | 
					
						
						
							
						
						da9099cecb
					 | 
					
						
						
							
							-target names for debug built dlls have now a "d" suffix
						
						
						
						
						
						
					 | 
					
						2018-03-09 18:33:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arin Alex
							
						 
					 | 
					
						
						
							
						
						2c0e343c55
					 | 
					
						
						
							
							Static build has been fixed.
						
						
						
						
						
						
						
						CONFIG no_zint & static_build flags have been added 
						
						
					 | 
					
						2017-06-16 03:06:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arin Alexander
							
						 
					 | 
					
						
						
							
						
						5001738d76
					 | 
					
						
						
							
							Designer project has been added
						
						
						
						
						
						
						
						Designer project has been added 
						
						
					 | 
					
						2016-07-21 12:48:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |