Merge pull request #12053 from birarda/bug/61-1-protocol-version

RC61.1: Manually push OwnershipChallengeFix to 3 (to avoid StaticCertJsonVersionOne conflict)
This commit is contained in:
Stephen Birarda 2017-12-21 19:45:55 -08:00 committed by GitHub
commit 072e818c99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -197,7 +197,7 @@ uint qHash(const PacketType& key, uint seed);
QDebug operator<<(QDebug debug, const PacketType& type); QDebug operator<<(QDebug debug, const PacketType& type);
enum class EntityVersion : PacketVersion { enum class EntityVersion : PacketVersion {
StrokeColorProperty = 77, StrokeColorProperty = 0,
HasDynamicOwnershipTests, HasDynamicOwnershipTests,
HazeEffect, HazeEffect,
OwnershipChallengeFix OwnershipChallengeFix