]> 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>
Mon, 6 Jan 2014 19:18:55 +0000 (21:18 +0200)
commit0b3f54e8d9366b135697ac1d96c15a85f55fcb62
tree666974149340ba6ef8171421bec5a020ec5419bd
parent8569ecdc2c9368dc0fe650b901cce7b37337ffec
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