Merge remote-tracking branch 'bunter/master'

Conflicts:
	src/hammer.c
This commit is contained in:
Dan Hirsch 2012-05-13 01:25:41 +01:00
commit 92df2d081b
3 changed files with 69 additions and 25 deletions

View file

@ -43,6 +43,7 @@ typedef struct input_stream {
char bit_offset;
char endianness;
char overrun;
GQueue *lr_stack;
} input_stream_t;
typedef struct parse_state {