Merge branch 'master' into dynamic_alloc_dev

Conflicts:
	tests/Makefile
	tests/test_encode1.c
This commit is contained in:
Petteri Aimonen
2012-01-05 22:10:29 +02:00
16 changed files with 1671 additions and 70 deletions

2
pb.h
View File

@@ -206,4 +206,4 @@ typedef enum {
#define PB_LAST_FIELD {0,0,0,0}
#endif
#endif