Merge branch 'nautilus-saved' into nautilus

author Ilya Dryomov <idryomov@gmail.com>

Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)

committer Ilya Dryomov <idryomov@gmail.com>

Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)
author Ilya Dryomov <idryomov@gmail.com>
Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)
committer Ilya Dryomov <idryomov@gmail.com>
Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Ilya Dryomov <idryomov@gmail.com>
	Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)
committer	Ilya Dryomov <idryomov@gmail.com>
	Tue, 20 Apr 2021 08:56:25 +0000 (10:56 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history