Suresh, Kamlesh 22b0b7259f merge conflicts		2020-03-06 18:04:30 -05:00
..
Atoms	merge conflicts	2020-03-06 18:04:30 -05:00
BaseClasses	addressing issue where cell resizes but accessory does not follow.	2020-02-28 13:38:27 -05:00
BaseControllers	textfield enhancement	2020-03-04 15:17:45 -05:00
Categories	merge	2020-03-04 09:13:06 -05:00
Containers	Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/category_collision	2020-03-05 09:56:51 -05:00
CustomPrimitives	color	2020-02-28 11:36:14 -05:00
FormUIHelpers	merge conflicts	2020-03-06 18:04:30 -05:00
Legacy	merge conflicts	2020-03-06 18:04:30 -05:00
Models	merge conflicts	2020-03-06 18:04:30 -05:00
Molecules	merge conflicts	2020-03-06 18:04:30 -05:00
Organisms	change the base decode functions	2020-03-02 14:54:48 -05:00
OtherHandlers	merge conflicts	2020-03-06 18:04:30 -05:00
Styles	fix semi colon paste in m file	2020-02-26 13:28:23 -05:00
SupportingFiles	add 2.0 font back for march release	2020-03-05 09:58:32 -05:00
Templates	merge conflicts	2020-03-06 18:04:30 -05:00
TopAlert	Top Alert Fixes for top color and status bar color	2020-02-26 11:49:31 -05:00
Utility	add 2.0 font back for march release	2020-03-05 09:58:32 -05:00
Info.plist	basic template	2019-01-08 10:21:16 -05:00
MVMCoreUI.h	update font	2020-02-26 11:06:34 -05:00