Merge branch 'clayhammer' into pending

Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
This commit is contained in:
Philip C Monk 2015-09-09 19:15:26 -04:00
commit 5bdd1e4503

View File

@ -71,7 +71,7 @@ INCLUDE=include
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
# NOTFORCHECKIN - restore -O3
# -DGHETTO
# -DGHETTO \
# -DHUSH
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
-funsigned-char \