Vladislav Vaintroub 29710b2839 Merge branch '10.4' into 10.5 ... # Conflicts: # win/packaging/extra.wxs.in		2019-11-27 16:02:34 +01:00
..
packaging	Merge branch '10.4' into 10.5	2019-11-27 16:02:34 +01:00
upgrade_wizard	Merge 10.3 into 10.4	2018-11-19 20:22:33 +02:00
create_def_file.js	Merge 10.2 into 10.3	2019-05-14 17:18:46 +03:00