Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge

This commit is contained in:
Roman Olearski 2017-07-18 12:04:28 +02:00
commit 86b909da44
2 changed files with 4 additions and 2 deletions

4
.gitmodules vendored
View file

@ -3,6 +3,6 @@
url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty
[submodule "libraries/fc"]
path = libraries/fc
url = https://bitbucket.org/peerplaysblockchain/peerplays-fc
path = libraries/fc
url = https://bitbucket.org/peerplaysblockchain/peerplays-fc.git
ignore = dirty

View file

@ -21,6 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <fc/smart_ref_impl.hpp>
#include <graphene/chain/betting_market_evaluator.hpp>
#include <graphene/chain/betting_market_object.hpp>
#include <graphene/chain/account_object.hpp>