Merge branch 'dev_get_rid_of_ternary_operator'
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Fri, 13 Sep 2013 08:31:45 +0000 (11:31 +0300)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Fri, 13 Sep 2013 08:31:45 +0000 (11:31 +0300)
1  2 
pb.h

diff --cc pb.h
Simple merge