Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:36:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bad merge during rebase

Browse source
This commit is contained in:
Andrew Meadows 2015-06-26 22:13:06 -07:00
parent e18506c77f
commit f274958beb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/PacketHeaders.h
View file

@ -186,6 +186,6 @@ const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32;
const PacketVersion VERSION_ENTITIES_HAVE_SIMULATOR_PRIORITY = 33;
const PacketVersion VERSION_ENTITIES_HAVE_SIMULATION_OWNER = 33;
#endif // hifi_PacketHeaders_h