Philip C Monk
|
f8faea5e24
|
Revert "test fork"
This reverts commit aafd5a1fe609a98115dcd2e61ed417b9b0418803.
|
2014-11-22 17:48:42 -05:00 |
|
Philip C Monk
|
6c0d313903
|
Merge remote-tracking branch 'origin/master' into test
Conflicts:
urb/urbit.pill
urb/zod/arvo/ames.hoon
v/ames.c
v/reck.c
v/unix.c
|
2014-11-22 17:37:36 -05:00 |
|
Philip C Monk
|
e5f42c34a4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-20 21:17:37 -05:00 |
|
Anton Dyudin
|
5e0cd65314
|
Formatting
|
2014-11-20 16:56:18 -08:00 |
|
Anton Dyudin
|
f811ba7960
|
Fixed header markdown
|
2014-11-20 15:09:48 -08:00 |
|
Philip C Monk
|
6814513ff9
|
new ships get directories
|
2014-11-20 17:16:57 -05:00 |
|
Philip C Monk
|
07a194218f
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-20 16:01:06 -05:00 |
|
Philip C Monk
|
d72948fd52
|
Merge branch 'preen' into test
Conflicts:
urb/zod/main/app/begin/core.hook
|
2014-11-20 15:44:13 -05:00 |
|
C. Guy Yarvin
|
c64887c41c
|
Finish restructuring jet state.
|
2014-11-20 11:58:55 -08:00 |
|
C. Guy Yarvin
|
d5f212c32d
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-20 11:49:47 -08:00 |
|
C. Guy Yarvin
|
6ea4bf7bb6
|
Correct jet nouns, step 1.
|
2014-11-20 11:49:27 -08:00 |
|
Galen Wolfe-Pauly
|
c1951975b8
|
test fork
|
2014-11-20 11:36:27 -08:00 |
|
C. Guy Yarvin
|
7112c087dc
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-19 18:37:20 -08:00 |
|
C. Guy Yarvin
|
eaaa7baa83
|
handle init in ef_init.
|
2014-11-19 18:36:36 -08:00 |
|
Philip C Monk
|
2fa60f4ec4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-19 21:30:39 -05:00 |
|
C. Guy Yarvin
|
47d60fec7c
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-19 16:46:40 -08:00 |
|
C. Guy Yarvin
|
60db57a48e
|
Fix some stuff; comment out uni jets.
|
2014-11-19 16:46:16 -08:00 |
|
Philip C Monk
|
29ff5d4c11
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-18 19:10:35 -05:00 |
|
C. Guy Yarvin
|
2979182ec4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-18 15:45:43 -08:00 |
|
C. Guy Yarvin
|
d3cf59a80f
|
About to bisect for memory leak.
|
2014-11-18 15:17:56 -08:00 |
|
Philip C Monk
|
f6d986886c
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-18 18:12:36 -05:00 |
|
C. Guy Yarvin
|
0c5492adda
|
More cold state.
|
2014-11-18 12:59:59 -08:00 |
|
C. Guy Yarvin
|
23a0228e7f
|
More calx adjustments.
|
2014-11-18 10:56:28 -08:00 |
|
C. Guy Yarvin
|
2282f050f7
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-18 10:39:53 -08:00 |
|
C. Guy Yarvin
|
7598994ba4
|
More calx adjustments.
|
2014-11-18 02:49:03 -08:00 |
|
C. Guy Yarvin
|
9a06716750
|
More calx tweaking.
|
2014-11-17 18:06:09 -08:00 |
|
C. Guy Yarvin
|
f205df3e66
|
More calx mayhem.
|
2014-11-17 15:57:08 -08:00 |
|
Philip C Monk
|
e3f887f2cd
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-17 18:34:33 -05:00 |
|
C. Guy Yarvin
|
43eeb64fc7
|
Another jet state adjustment.
|
2014-11-17 15:24:40 -08:00 |
|
C. Guy Yarvin
|
031856b0ef
|
Re-restructure calx.
|
2014-11-17 14:57:05 -08:00 |
|
C. Guy Yarvin
|
5332ae57a3
|
Revert jet code to un-break.
|
2014-11-17 14:12:11 -08:00 |
|
C. Guy Yarvin
|
3e7455a14e
|
This commit is broken!
|
2014-11-17 13:56:51 -08:00 |
|
Philip C Monk
|
a159bca4f3
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-17 16:20:08 -05:00 |
|
Philip C Monk
|
d62d8fb6fd
|
added private messaging in chat
|
2014-11-17 16:19:51 -05:00 |
|
C. Guy Yarvin
|
cf1dbcb128
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-15 18:19:11 -08:00 |
|
C. Guy Yarvin
|
1055dc00e7
|
Restructure calx.
|
2014-11-15 17:24:19 -08:00 |
|
C. Guy Yarvin
|
dfbd88b7b9
|
Various fixes and improvements.
|
2014-11-15 17:10:15 -08:00 |
|
C. Guy Yarvin
|
f3fba50144
|
Moar edits.
|
2014-11-15 17:10:05 -08:00 |
|
Jared Hance
|
e54f4699ee
|
Fix distclean
|
2014-11-13 18:54:14 -05:00 |
|
Jared Hance
|
cf743aa690
|
Revert "Add shortrules to Makefile, enable."
This reverts commit 58d7bf855e7fc3733ec43cc63147910c4d4a5727.
|
2014-11-13 18:34:10 -05:00 |
|
Jared Hance
|
324186166c
|
Majorly unscrew the build system
|
2014-11-13 18:33:46 -05:00 |
|
vere
|
9066a62638
|
Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
v/unix.c
|
2014-11-12 19:57:45 +00:00 |
|
Philip C Monk
|
6f068cc377
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-11 19:51:06 -05:00 |
|
C. Guy Yarvin
|
6585c016c9
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-11 13:50:06 -08:00 |
|
C. Guy Yarvin
|
9b4da218aa
|
Solve malloc alignment issues.
|
2014-11-11 13:49:45 -08:00 |
|
C. Guy Yarvin
|
16952e13f8
|
Band-aid on a clay timer bug.
|
2014-11-11 11:03:16 -08:00 |
|
vere
|
fa02dcfba8
|
Fix clay timer explosion on zod.
|
2014-11-11 02:36:13 +00:00 |
|
Galen Wolfe-Pauly
|
ed683044c5
|
hn
|
2014-11-08 19:12:06 -08:00 |
|
C. Guy Yarvin
|
d1e64e60da
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2014-11-07 14:55:15 -08:00 |
|
C. Guy Yarvin
|
4815cbcfa6
|
Before gmp malloc changeover.
|
2014-11-07 14:54:59 -08:00 |
|