2 commits

Author	SHA1	Message	Date
Sandra Keßler	389eae93c5	renamed goToMainMenuScreen to gotToMainTypeMenu to make it clevrer that Menu.isMaintype is meant, deactivates getBasal for now	2017-08-12 14:15:04 +02:00
Sandra Keßler	e2b09f9e42	recovered merge/unmerge damage	2017-08-11 17:35:58 +02:00