urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-16 23:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,092 Commits 768 Branches 10 Tags 215 MiB
d58b0b5894
Commit Graph

2092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pier on do
49349c1b7d Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 13:59:49 -04:00
pier on do
7384367baa Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 13:50:22 -04:00
C. Guy Yarvin
b5433a7875 Merge branch 'test' of https://github.com/urbit/urbit into karpi 2015-10-21 10:48:17 -07:00
Anton Dyudin
1907115878 Merge branch 'karpi' of https://github.com/cgyarvin/urbit-1 into test 2015-10-21 10:45:13 -07:00
Anton Dyudin
4a66e9359c Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 10:45:02 -07:00
C. Guy Yarvin
547be90fd0 Merge branch 'test' of https://github.com/urbit/urbit into karpi 2015-10-21 10:40:22 -07:00
C. Guy Yarvin
c5a43123d8 Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-21 10:39:40 -07:00
John Franklin
3876b22627 Add gtags (gnu global) and cscope tag generation targets. 2015-10-21 03:44:53 -05:00
Anton Dyudin
e25a496640 Merge branch 'test' of https://github.com/galenwp/urbit into pittyp 2015-10-20 16:28:18 -07:00
Anton Dyudin
bc86863682 Merge branch 'test' into pittyp 2015-10-20 14:33:51 -07:00
C. Guy Yarvin
43c3d35ef3 Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-20 13:55:53 -07:00
C. Guy Yarvin
771ce400bc Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-20 12:17:22 -07:00
Galen Wolfe-Pauly
368dc4b53c master merge readme 2015-10-20 12:10:02 -07:00
Galen Wolfe-Pauly
8f85bb6eb2 simpler 2015-10-20 11:49:40 -07:00
Galen Wolfe-Pauly
6c9feb38e5 ports 2015-10-20 11:47:43 -07:00
Galen Wolfe-Pauly
f1bedbf42c simpler 2015-10-20 11:46:25 -07:00
Galen Wolfe-Pauly
5f87e74098 minor 2015-10-20 11:44:53 -07:00
Galen Wolfe-Pauly
d584387dd5 clarifying 2015-10-20 11:43:56 -07:00
Galen Wolfe-Pauly
1358a2aaf2 new readme 2015-10-20 11:40:29 -07:00
C. Guy Yarvin
e6b5c485ac Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-19 14:15:01 -07:00
C. Guy Yarvin
3ff382a541 Merge branch 'master' of https://github.com/urbit/urbit into karpi 2015-10-19 13:59:20 -07:00
C. Guy Yarvin
1ba234cee2 Fix typos. 2015-10-19 13:59:09 -07:00
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