| Author | 
Committer | 
Branch | 
Timestamp | 
Parent | 
| mlampert | 
mlampert | 
master | 
2017-01-27 06:03:33 | 
master f0db6b82 | 
| 
	Changeset | 
Fixed merge issues and re-enabled tests. | 
| mod - src/Mod/Path/PathScripts/PathDressupHoldingTags.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/TestPathApp.py | 
	
		Diff	
	
		File	
 |