Conflicts: source/packages/filemng/IEComboBox.pas source/packages/my/HistoryComboBox.pas Source commit: 9edcae8d8a9129120eb5f21fdfbb901a77c7b4ca
Martin Prikryl