Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Update submodules

Browse source
This commit is contained in:
Vikram Rajkumar 2017-01-17 16:42:33 -06:00
parent 0053613b38
commit ef356a15a6
6 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,8 +1,8 @@
[submodule "docs"] [submodule "docs"]
path = docs path = docs
url = https://github.com/cryptonomex/graphene.wiki.git url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty ignore = dirty
[submodule "libraries/fc"] [submodule "libraries/fc"]
path = libraries/fc path = libraries/fc
url = https://github.com/cryptonomex/fc.git url = https://github.com/bitshares/bitshares-fc.git
ignore = dirty ignore = dirty

2
docs

@ -1 +1 @@
Subproject commit 8d8b69d82482101279460fa02f814d0e4030966f Subproject commit cc4a57cf18161d591bb2ad23a2cfa630fa2f9915

1
libraries/chain/include/graphene/chain/protocol/account.hpp
View file

@ -264,7 +264,6 @@ namespace graphene { namespace chain {
} } // graphene::chain } } // graphene::chain
FC_REFLECT(graphene::chain::account_options, (memo_key)(voting_account)(num_witness)(num_committee)(votes)(extensions)) FC_REFLECT(graphene::chain::account_options, (memo_key)(voting_account)(num_witness)(num_committee)(votes)(extensions))
FC_REFLECT_TYPENAME( graphene::chain::account_whitelist_operation::account_listing)
FC_REFLECT_ENUM( graphene::chain::account_whitelist_operation::account_listing, FC_REFLECT_ENUM( graphene::chain::account_whitelist_operation::account_listing,
(no_listing)(white_listed)(black_listed)(white_and_black_listed)) (no_listing)(white_listed)(black_listed)(white_and_black_listed))

1
libraries/chain/include/graphene/chain/protocol/authority.hpp
View file

@ -132,5 +132,4 @@ void add_authority_accounts(
} } // namespace graphene::chain } } // namespace graphene::chain
FC_REFLECT( graphene::chain::authority, (weight_threshold)(account_auths)(key_auths)(address_auths) ) FC_REFLECT( graphene::chain::authority, (weight_threshold)(account_auths)(key_auths)(address_auths) )
FC_REFLECT_TYPENAME( graphene::chain::authority::classification )
FC_REFLECT_ENUM( graphene::chain::authority::classification, (owner)(active)(key) ) FC_REFLECT_ENUM( graphene::chain::authority::classification, (owner)(active)(key) )

1
libraries/chain/include/graphene/chain/protocol/vote.hpp
View file

@ -146,7 +146,6 @@ void from_variant( const fc::variant& var, graphene::chain::vote_id_type& vo );
} // fc } // fc
FC_REFLECT_TYPENAME( graphene::chain::vote_id_type::vote_type )
FC_REFLECT_TYPENAME( fc::flat_set<graphene::chain::vote_id_type> ) FC_REFLECT_TYPENAME( fc::flat_set<graphene::chain::vote_id_type> )
FC_REFLECT_ENUM( graphene::chain::vote_id_type::vote_type, (witness)(committee)(worker)(VOTE_TYPE_COUNT) ) FC_REFLECT_ENUM( graphene::chain::vote_id_type::vote_type, (witness)(committee)(worker)(VOTE_TYPE_COUNT) )

2
libraries/fc

@ -1 +1 @@
Subproject commit 31adee49d91275cc63aa3a47b3a9e3c826baccca Subproject commit c1361d8cf97de719b6fd0ece244b3ae51d472e3e