]> git.stg.codes - stg.git/commit
Merge branch 'naffanya-dev'
authorMaxim Mamontov <faust@stg.dp.ua>
Fri, 23 Aug 2013 18:59:58 +0000 (21:59 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Fri, 9 Jan 2015 19:25:19 +0000 (21:25 +0200)
commitb078cd0fbf7dee4e222fcffffac2ded8a3c9d3a3
tree562ba2fbb8bb8e6082dc8a1749e94298beadc881
parentb2feeb7214b97678c52075570e40e52828914a82
Merge branch 'naffanya-dev'
include/stg/settings.h
include/stg/user.h
include/stg/user_property.h
include/stg/users.h
projects/stargazer/main.cpp
projects/stargazer/settings_impl.cpp
projects/stargazer/settings_impl.h
projects/stargazer/user_impl.cpp
projects/stargazer/user_impl.h