Merge remote-tracking branch 'upstream/master' into feature/savestates-2

This commit is contained in:
Hamish Milne 2020-03-28 12:33:21 +00:00
commit 7049af744f
77 changed files with 18323 additions and 11473 deletions

View file

@ -4,6 +4,7 @@
#pragma once
#include <algorithm>
#include <array>
#include <deque>
#include <boost/serialization/deque.hpp>