Merge branch 'stg-2.409-radius'

author Maksym Mamontov <madf@madf.info>

Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)

committer Maksym Mamontov <madf@madf.info>

Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)
author Maksym Mamontov <madf@madf.info>
Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)
committer Maksym Mamontov <madf@madf.info>
Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)
diff --cc projects/stargazer/build
Simple merge
diff --cc projects/stargazer/settings_impl.cpp
Simple merge
diff --cc projects/stargazer/settings_impl.h
Simple merge
diff --cc stglibs/common.lib/common.cpp
Simple merge
diff --cc stglibs/common.lib/include/stg/common.h
Simple merge
author	Maksym Mamontov <madf@madf.info>
	Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)
committer	Maksym Mamontov <madf@madf.info>
	Wed, 1 Jan 2020 19:12:22 +0000 (21:12 +0200)
		1	2
projects/stargazer/build	patch \|	diff1 \|	diff2 \|	blob \| history
projects/stargazer/settings_impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
projects/stargazer/settings_impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
stglibs/common.lib/common.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
stglibs/common.lib/include/stg/common.h	patch \|	diff1 \|	diff2 \|	blob \| history