|  | 7587df831a | Merge branch 'develop' into feature/hadrons # Conflicts:
#	lib/qcd/action/scalar/ScalarImpl.h | 2017-06-20 15:50:39 +01:00 |  | 
			
				
					| 
							
							
								 paboyle | 3bfd1f13e6 | I/O improvements | 2017-06-11 23:14:10 +01:00 |  | 
			
				
					|  | 22749699a3 | Fixes after merge and point sink module | 2017-06-06 11:45:30 -05:00 |  | 
			
				
					|  | afbf7d4c37 | QED Gimpl moved in Photon.h | 2016-12-29 22:43:38 +01:00 |  | 
			
				
					|  | 4c3fd9fa3f | stochastic QED field module in Hadrons | 2016-12-22 00:29:41 +01:00 |  | 
			
				
					|  | 67d72000e7 | Hadrons: more legal banner fixes | 2016-12-15 18:26:39 +00:00 |  | 
			
				
					|  | 80cef1c78f | Hadrons: legal banner fix | 2016-12-15 18:21:52 +00:00 |  | 
			
				
					|  | 3af663e17b | Hadrons: modules remember their factory registration name | 2016-12-14 17:59:45 +00:00 |  | 
			
				
					|  | 7ae734103e | Hadrons: namespace macro to tackle GCC 5 bug | 2016-12-05 14:29:32 +09:00 |  | 
			
				
					|  | 320268fe93 | Hadrons: code cleaning | 2016-12-05 13:57:34 +09:00 |  | 
			
				
					|  | dd6fb140c5 | Hadrons: big module reorganisation | 2016-12-05 13:53:31 +09:00 |  |