Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-12-03 09:46:54 -08:00
commit eaef1bbf7a

View File

@ -73,7 +73,7 @@
/** Address space layout.
**/
# if defined(U3_OS_linux)
# define U3_OS_LoomBase 0x404db000
# define U3_OS_LoomBase 0x36000000
# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB
# elif defined(U3_OS_osx)
# ifdef __LP64__