Merge branch 'stg-2.409'

author Maxim Mamontov <faust.madf@gmail.com>

Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)

committer Maxim Mamontov <faust.madf@gmail.com>

Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
author Maxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
committer Maxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
diff --cc projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf
Simple merge
diff --cc projects/stargazer/inst/linux/etc/stargazer/stargazer.conf
Simple merge
diff --cc projects/stargazer/settings_impl.cpp
Simple merge
diff --cc projects/stargazer/settings_impl.h
Simple merge
diff --cc projects/stargazer/user_impl.cpp
Simple merge
author	Maxim Mamontov <faust.madf@gmail.com>
	Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
committer	Maxim Mamontov <faust.madf@gmail.com>
	Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
		1	2
projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf	patch \|	diff1 \|	diff2 \|	blob \| history
projects/stargazer/inst/linux/etc/stargazer/stargazer.conf	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
projects/stargazer/user_impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history