Merge
authorAsher Baker <asherkin@gmail.com>
Thu Apr 26 17:01:16 2012 +0100 (2012-04-26)
changeset 348950049751bf4a
parent 3487 b7d90d0667e9
parent 3488 bee90c8ef6c3
child 3490 fffb8efd8b72
Merge
     1.1 --- a/core/PlayerManager.h	Wed Apr 18 21:16:01 2012 -0400
     1.2 +++ b/core/PlayerManager.h	Thu Apr 26 17:01:16 2012 +0100
     1.3 @@ -56,7 +56,7 @@
     1.4  	uint32_t   value;
     1.5  	struct
     1.6  	{
     1.7 -		uint8_t  index;
     1.8 +		uint32_t index  :  8;
     1.9  		uint32_t serial : 24;
    1.10  	} bits;
    1.11  };