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

@ -8,11 +8,11 @@
There is NO WARRANTY for this software. See license.txt for
details. */
#include "common.h"
#include "avian/common.h"
#include <avian/vm/codegen/targets.h>
#include "environment.h"
#include "avian/environment.h"
namespace avian {
namespace codegen {