]> git.stg.codes - stg.git/commitdiff
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)
1  2 
projects/stargazer/settings_impl.cpp
projects/stargazer/settings_impl.h

Simple merge
Simple merge