6 Commits

Author	SHA1	Message	Date
Magne Sjaastad	a8b8e061d7	#1596 Merge dev into pre-proto	2017-06-14 07:25:34 +02:00
Jacob Støren	d8d2aaed5f	#1585 More rename and code reordering of StimPlanFractureTemplate	2017-06-13 15:07:16 +02:00
Jacob Støren	f09374b12a	#1585 Rename in StimPlanFractureTemplate. Move obsolete method to upscaling	2017-06-13 15:07:16 +02:00
Magne Sjaastad	dd912b4f97	Merge branch 'dev' into pre-proto	2017-06-08 14:09:03 +02:00
Jacob Støren	54e8aea51a	#1503 Use fracture layout icon, and improve icon a bit	2017-06-05 09:15:31 +02:00
Bjørnar Grip Fjær	0318a8c455	Move fracture related models under completions folder	2017-06-01 14:25:38 +02:00