]> git.stg.codes - stg.git/commit
Fixed merge issues.
authorMaxim Mamontov <faust.madf@gmail.com>
Mon, 6 Jan 2014 19:18:55 +0000 (21:18 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Fri, 9 Jan 2015 19:52:00 +0000 (21:52 +0200)
commit9fdd58e794e43fc2435265c4fb2f6933758f3c0b
treed78b6b72bfcaf096f6f6a45a4861169e7fa46d13
parent0c80dbc4ce66a278eb5235420d34a469323efc6b
Fixed merge issues.
include/stg/user_traff.h
projects/stargazer/plugins/store/firebird/firebird_store.cpp
projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
projects/stargazer/plugins/store/mysql/mysql_store.cpp
projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
projects/stargazer/user_impl.h