Christiano, Kevin b592ff5047 Merge branch 'develop' into feature/kevin ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-03-21 15:47:49 -04:00
..
Atoms	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00
BaseControllers	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00
Categories	top alert fix	2019-01-16 15:51:30 -05:00
Containers	warning fixes	2019-03-14 11:47:05 -04:00
LegacyControllers	Convert files to swift and simplify	2019-02-13 23:16:52 -05:00
Molecules	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00
OtherHandlers	placing CaretButton in molecule map.	2019-03-21 14:58:22 -04:00
Styles	import fix	2019-01-14 17:40:38 -05:00
SupportingFiles	Move mf switch to core ui	2019-02-01 12:52:16 -05:00
Templates	file name fixes	2019-03-11 14:08:28 -04:00
TopAlert	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00
Utility	Conversion and atomization of objc MFCaretView to Swift. Removed MFCaretView objc classes. Reflection change in import statements. Added new constants KeyIsOpaque. Provided default init for atoms cis setAsMolecule(). Removed extraneous @objc at class declaration line of DashLine.	2019-03-20 13:06:52 -04:00
Info.plist	basic template	2019-01-08 10:21:16 -05:00
MVMCoreUI.h	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00