git.stg.codes - stg.git/commit

]> git.stg.codes - stg.git/commit

author	Maxim Mamontov <faust.madf@gmail.com>
	Mon, 6 Jan 2014 15:51:09 +0000 (17:51 +0200)
committer	Maxim Mamontov <faust.madf@gmail.com>
	Fri, 9 Jan 2015 19:50:56 +0000 (21:50 +0200)
commit	0c80dbc4ce66a278eb5235420d34a469323efc6b
tree	2e93721df6432b98e373c64faeda66d6277c52d4	tree \| snapshot
parent	793728a58d8f97daf7de1dde7a02a5c4a30e30d4	commit \| diff

Merge branch 'new-daily-fee'

Conflicts:
include/stg/tariff_conf.h
projects/stargazer/plugins/store/firebird/Makefile
projects/stargazer/plugins/store/firebird/firebird_store.cpp
projects/stargazer/plugins/store/firebird/firebird_store.h
projects/stargazer/plugins/store/mysql/Makefile
projects/stargazer/plugins/store/mysql/mysql_store.cpp
projects/stargazer/plugins/store/mysql/mysql_store.h
projects/stargazer/plugins/store/postgresql/Makefile
projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
projects/stargazer/plugins/store/postgresql/postgresql_store.h
projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp

20 files changed:

doc/xmlrpc/API-tariffs.xml		diff \| blob \| history
include/stg/tariff.h		diff \| blob \| history
include/stg/tariff_conf.h		diff \| blob \| history
projects/stargazer/inst/var/01-alter-02.mysql.sql	[new file with mode: 0644]	blob
projects/stargazer/inst/var/01-alter-02.postgresql.sql	[new file with mode: 0644]	blob
projects/stargazer/inst/var/01-alter-02.sql	[new file with mode: 0644]	blob
projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.cpp		diff \| blob \| history
projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp		diff \| blob \| history
projects/stargazer/plugins/store/files/file_store.cpp		diff \| blob \| history
projects/stargazer/plugins/store/firebird/firebird_store.cpp		diff \| blob \| history
projects/stargazer/plugins/store/firebird/firebird_store.h		diff \| blob \| history
projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp		diff \| blob \| history
projects/stargazer/plugins/store/mysql/mysql_store.cpp		diff \| blob \| history
projects/stargazer/plugins/store/mysql/mysql_store.h		diff \| blob \| history
projects/stargazer/plugins/store/postgresql/postgresql_store.cpp		diff \| blob \| history
projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp		diff \| blob \| history
projects/stargazer/tariff_impl.h		diff \| blob \| history
projects/stargazer/user_impl.cpp		diff \| blob \| history
projects/stargazer/user_impl.h		diff \| blob \| history
projects/stargazer/users_impl.cpp		diff \| blob \| history

Stargazer Billing System

RSS Atom