Merge branch 'stg-2.409' into stg-2.409-radius
authorMaxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 12:59:24 +0000 (15:59 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Sat, 17 Sep 2016 12:59:24 +0000 (15:59 +0300)
commitcf99afd4c25f733f4fe72ef780e4cd70ee25e459
treeb92bca3d5bf46c502625168808f796bf6f8ee99d
parentaa361b5b0d95c7023b272c2c423af9d71c930787
parent4ad0ededeb39c31c200011957b63dc485a04027e
Merge branch 'stg-2.409' into stg-2.409-radius
projects/stargazer/settings_impl.cpp
projects/stargazer/settings_impl.h