Merge branch 'stg-2.409'
authorMaxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 13:03:04 +0000 (16:03 +0300)
commitd1c864e3feaf4295d366e2ef497495738ce15337
tree53f21d5a554847418b3399b01debb0af3501f6a2
parent6a24f530fab7ebff1617f6d3929d2fcad7ed4818
parent4ad0ededeb39c31c200011957b63dc485a04027e
Merge branch 'stg-2.409'
projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf
projects/stargazer/inst/linux/etc/stargazer/stargazer.conf
projects/stargazer/settings_impl.cpp
projects/stargazer/settings_impl.h
projects/stargazer/user_impl.cpp