Please tell us in detail which of the problems you are struggling with requires a merge of crop_rec_4k and lua_fix because it cannot be handled by either version alone?
Ceterum censeo experimental build page esse delendam!
e98cf27: api_test.lua: test for all items from the Overlay menu
(to make sure they can be safely turned on or off with menu.set)
TODO: also check their submenu options
4c6cde3: Waveform: fix crash when enabled outside ML menu
(e.g. from Lua,
https://www.magiclantern.fm/forum/index.php?topic=23673)
Issue: initialization on first use + race condition.
abdd1e2: api_test.lua: on EOS M, the INFO button may get us out of LiveView
(fixes API test about ML overlay status)
085b79c: EOS M: fixed display_idle() outside LiveView
4aa1ba0: Zoom on HalfShutter: allow triggering when AF is enabled
(only works when AF is not actually triggered by half-shutter, *, AF-ON etc)
df8d088: Zoom tweaks: updated for recent models
- option to disable the "x1" zoom (i.e. to go directly into x5/x10)
- compatibility with touch-screen models (still rough)
- api_test.lua updated (need to disable these tweaks in order to pass the zoom test)
3a5bade: api_test.lua: skip checking for "Play mode actions"
(feature not present on EOS M; requires serious cleanup)
400d73f: EOS M: enabled rack focus and focus stacking
(they appear to work, at least with regular EF lenses)
0060b26: editor.lua: disabled debugging features
(FIXME: they don't seem to work)
252a4b7: EOS M, 100D: fix Q/SET short press outside ML menu
(ETTR trigger and many others)
3f5aa76: editor.lua: use the MENU key as primary method for triggering the menu
(Q is still used, but it's not working on all models)
b213791: EOS M: align long-press symbols for delete and Q/SET
(minor)
20628f1: EOS M, 100D: fix long-press symbol remaining visible after Q/SET
https://www.magiclantern.fm/forum/index.php?topic=14828.msg210032#msg210032 f40dacf: Arrow key shortcuts: minor cleanups
- removed bogus ARROW_MODE_TOGGLE_KEY definition on EOS M
- removed unused definitions on 650D and 1100D
- require ARROW_MODE_TOGGLE_KEY if and only if FEATURE_ARROW_SHORTCUTS is defined
9e54731: EOS M: fix PlayMain_handler stub
7000D, 650D, 100D: comments for PlayMain_handler / PlayMovieGuideApp_handler
7b7a9a3: Color scheme: fix conflict with fast zebras
684ff6b: Menu: fix typo regarding FEATURE_JUNKIE_MENU
(7469c34)
91c84fd: exit_play_qr_menu_mode: wait until mode switch is finished
(fixes GUI mode switching test in api_test.lua on EOS M, maybe others)
7256e17: EOS M: fix GUIMODE_ML_MENU to allow operation outside LiveView
(required for passing the Lua menu API tests outside LV)
sorry can't help you.
I don't know how update api_test.lua inside ML and recompile.
but seem most fox for EOS M I think....not 5d3, or meaby not...bhoooooo?!
the rest seem dead..