Merge remote-tracking branch 'stagrlee/master' into autotools

Conflicts:
	Makefile
	jq_test.c
This commit is contained in:
Stephen Dolan committed 2013-05-08 00:52:24 +01:00
commit 2363246eea
17 files changed
+388 -157

No files matched your search

+1
View File
@@ -12,6 +12,7 @@
#include "frame_layout.h"
#include "jv_alloc.h"
#include "jq_parser.h"
#include "locfile.h"
#include "jv.h"
#include "jv_aux.h"