ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-12 20:28:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into wip

Browse Source 
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
parent 4d38873096 27d7c8a3c0
commit 9327043bc5
124 changed files with 3345 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unittest/test-harness.cpp
View File

@ -10,7 +10,6 @@
#include <stdio.h>
#include "common.h"
#include "test-harness.h"
// since we aren't linking against libstdc++, we must implement this