Merge branch 'fix-recname-macro' into work-plus
Merge branch 'misc' into work-plus
Merge branch 'fix-etc' into work-plus

Conflicts:
	EpgDataCap3/EpgDataCap3/EpgDataCap3Main.cpp
Merge branch 'misc-ui' into work-plus
このForkについての説明を追加