Merge branch 'master' into wip

Conflicts:
	makefile
	src/codegen/arm/assembler.cpp
	src/codegen/powerpc/assembler.cpp
	src/codegen/x86/assembler.cpp
This commit is contained in:
Joshua Warner
2013-02-27 19:27:07 -07:00
124 changed files with 3345 additions and 1122 deletions

View File

@ -10,10 +10,10 @@
#include <stdint.h>
#include "target.h"
#include "alloc-vector.h"
#include "allocator.h"
#include "zone.h"
#include "avian/target.h"
#include "avian/alloc-vector.h"
#include "avian/allocator.h"
#include "avian/zone.h"
#include <avian/util/abort.h>