ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-04 10:52:18 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,120 Commits 6 Branches 0 Tags 164 MiB
80e792ddac
Commit Graph

2120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
ad67b87200 Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-19 13:45:09 -07:00
C. Guy Yarvin
c913f0b7c2 Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-19 11:16:23 -07:00
Raymond Pasco
4e6e1fb2e6 Merge branch 'jfranklin9000-etags' into test 2015-10-19 13:50:30 -04:00
John Franklin
6c3736a060 fix etags target 2015-10-19 12:30:46 -05:00
Raymond Pasco
13ca59eeb5 Merge/backport John Franklin patches into test 
u3e_fault fixes and extra printf
Makefile and doc changes (from master)
 2015-10-19 13:08:36 -04:00
Raymond Pasco
009bb97df6 Merge branch 'jfranklin9000-gdb_tips' 2015-10-19 13:07:59 -04:00
John Franklin
fcc8e8ada2 Add notes on debugging with gdb. 2015-10-19 13:06:30 -04:00
John Franklin
5d8bffd11b print loom and fix a range calculation in u3e_fault() 2015-10-19 10:10:23 -05:00
Raymond Pasco
bfa5112164 Merge doc changes from test 2015-10-18 16:43:02 -04:00
Raymond Pasco
a4c7ae6c20 Merge u3.md changes from jfranklin9000 2015-10-18 16:41:44 -04:00
John Franklin
de28b2c0a4 Clarifications to Spec/u3.md 2015-10-18 15:33:48 -05:00
C. Guy Yarvin
04d916aa59 Eliminate hasty chroot. 2015-10-17 20:29:59 -07:00
C. Guy Yarvin
3f2b00109b Suspicious of this fix. 2015-10-17 20:23:53 -07:00
C. Guy Yarvin
cd2be04ff4 Merge branch 'test' 2015-10-17 13:07:36 -07:00
C. Guy Yarvin
1a47b2d5b8 Merge cgyarvin fixes into test. 2015-10-17 13:01:38 -07:00
C. Guy Yarvin
cda9537d0e Iterative welder for long lists. 2015-10-17 12:56:18 -07:00
C. Guy Yarvin
1d718c9650 Merge branch 'test', because of continuity breach. 2015-10-17 12:03:25 -07:00
C. Guy Yarvin
0092b47ba4 Merge in Galen's test branch. 2015-10-16 16:12:43 -07:00
Raymond Pasco
2edb8c07a3 Merge remote-tracking branch 'cahiggins/moon-talk' into test 2015-10-15 23:59:51 -04:00
Anton Dyudin
866eaaffce Merge branch 'nobreach' into test 2015-10-15 15:49:09 -07:00
Raymond Pasco
9fc79867c4 Merge cosmetic changes from 'jfranklin9000/test' 2015-10-15 14:27:10 -04:00
John Franklin
0fdb149c59 Fix some comments in vere.h. No changes to the compiled code. 2015-10-15 12:51:47 -05:00
Raymond Pasco
64e271954a Merge branch 'jfranklin9000-usage' into test 2015-10-13 00:43:11 -04:00
John Franklin
d73fdfae61 Generalize the message if trying to use -c or -w on an existing pier. 2015-10-12 23:32:16 -05:00
C. Guy Yarvin
02277f6ca0 Merge branch 'test' of https://github.com/urbit/urbit into karpi 
Conflicts:
	urb/urbit.pill
 2015-10-12 17:10:56 -07:00
Galen Wolfe-Pauly
01ae717c3f Merge branch 'test' of github.com:galenwp/urbit into test 2015-10-11 21:48:38 -07:00
C. Guy Yarvin
e92012984c Doc fixes and changes to match. 2015-10-09 18:31:07 -07:00
Anton Dyudin
3c72b88c85 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-10-09 10:56:57 -07:00
Anton Dyudin
63e43d01a8 Merge branch 'nobreach' into pittyp 2015-10-08 15:24:29 -07:00
Raymond Pasco
a02cad6e3c Merge branch 'talk-nicknames' into test 2015-10-08 17:52:57 -04:00
Raymond Pasco
e99be669e8 Merge remote-tracking branch 'juped/usage-compilefix' into test 2015-10-08 13:17:56 -04:00
Raymond Pasco
26e0060cd1 C89 compatible for loop 2015-10-08 13:17:15 -04:00
Anton Dyudin
1788375aac Merge branch 'pittyp' into test 2015-10-07 16:35:53 -07:00
Anton Dyudin
af70039fa1 Merge branch 'test' of https://github.com/urbit/urbit into pittyp 2015-10-07 16:31:52 -07:00
C. Guy Yarvin
ef7656dae0 Merge branch 'test' of https://github.com/urbit/urbit into karpi 2015-10-07 16:24:11 -07:00
C. Guy Yarvin
0b84ccf360 Remove # prompt. 2015-10-07 15:42:19 -07:00
Anton Dyudin
df7703c1f2 Merge branch 'nobreach' into test 2015-10-07 11:59:31 -07:00
Anton Dyudin
b110c9e085 Merge branch 'nobreach' into test 2015-10-07 11:28:28 -07:00
Raymond Pasco
36246ab4b0 Merge branch 'chc4-usage' into test 2015-10-07 05:50:22 -04:00
chc4
f265f80ab3 Update usage 
I didn't list most of the ones that I never heard about before (-r, -l, -b)
 2015-10-07 00:39:38 -04:00
Anton Dyudin
d8adcd00e8 Merge branch 'moretalk' into nobreach 2015-10-06 15:36:13 -07:00
Philip C Monk
337b93e8f9 Merge remote-tracking branch 'galen/test' into pending 2015-10-05 20:14:42 -04:00
Galen Wolfe-Pauly
3b11bc7e62 Merge branch 'test' of github.com:urbit/urbit into test 2015-10-05 16:13:17 -07:00
Anton Dyudin
8c35fc8006 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-10-05 15:18:36 -07:00
Galen Wolfe-Pauly
d0d6643fa6 minor 2015-10-05 14:35:16 -07:00
Anton Dyudin
cfa49cd4c2 Merge branch 'master' of https://github.com/urbit/urbit into moretalk 2015-10-05 14:26:14 -07:00
Philip C Monk
6bfd064670 Merge branch 'master' into test 2015-10-05 17:09:03 -04:00
Philip C Monk
ee91507f15 Merge remote-tracking branch 'origin/master' 2015-10-05 17:08:09 -04:00
Galen Wolfe-Pauly
2317064e74 mount instructions 2015-10-05 14:01:41 -07:00
Galen Wolfe-Pauly
cb665f41c9 Merge branch 'test' of github.com:galenwp/urbit into test 2015-10-02 17:42:56 -07:00