Commit Graph

5697 Commits

Author SHA1 Message Date
C. Guy Yarvin
a7e81cad07 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2013-10-08 19:24:45 -07:00
C. Guy Yarvin
b695cff3f7 Fix some IP handling issues. 2013-10-08 19:23:01 -07:00
Curtis Yarvin
ddadc4be65 More printfs... 2013-10-08 18:26:59 +00:00
C. Guy Yarvin
4b695bceae Fix an update bug. 2013-10-08 09:47:25 -07:00
C. Guy Yarvin
32388833e9 Merge branch 'master' of github.com:urbit/urbit 2013-10-07 22:57:16 -07:00
C. Guy Yarvin
68008233df More diagnostics. 2013-10-07 22:56:57 -07:00
johncburnham
6cca9dcb11 Merge pull request #54 from mrdomino/master
Consider both FreeBSD and OpenBSD "bsd"
2013-10-07 20:42:11 -07:00
C. Guy Yarvin
4dfa41969e Report == procfs. 2013-10-07 19:29:20 -07:00
Curtis Yarvin
e75d2e514a Merge blocklist and printfs. 2013-10-08 02:04:25 +00:00
Curtis Yarvin
178dd13afe Impromptu blocklist; display %rx, %tx. 2013-10-08 02:04:08 +00:00
C. Guy Yarvin
a35574cf2f procfs for clay. 2013-10-07 18:58:06 -07:00
C. Guy Yarvin
a146537548 Introspection for %clay. 2013-10-07 17:40:45 -07:00
C. Guy Yarvin
257a3061f7 Daniel Nagy was accidentally dispossessed. 2013-10-06 11:42:20 -07:00
C. Guy Yarvin
4de22868bb Development "branch" goes back to production. 2013-10-06 00:44:07 -07:00
C. Guy Yarvin
875eec276d Merge branch 'master' of github.com:urbit/urbit 2013-10-04 22:34:39 -07:00
Curtis Yarvin
fbfade8983 Merge branch 'master' of github.com:urbit/urbit 2013-10-04 22:33:45 +00:00
cgyarvin
f31fd69155 Merge pull request #51 from dnadle/master
Handle autosave SIGCHLD with no stored pid
2013-10-04 07:04:52 -07:00
C. Guy Yarvin
cc2ea2f301 Merge branch 'master' of github.com:urbit/urbit 2013-10-03 22:27:18 -07:00
johncburnham
270f3eb0a9 Merge pull request #50 from philipcmonk/master
Add ninja modes to hoon.vim
2013-10-03 21:14:28 -07:00
Philip Monk
63138ecd83 Merge branch 'master' of https://github.com/philipcmonk/hoon.vim 2013-10-03 20:17:52 -07:00
C. Guy Yarvin
acb3096b1c Merge branch 'master' of github.com:urbit/urbit 2013-10-03 13:49:15 -07:00
C. Guy Yarvin
d62b84002d Merge branch 'master' of github.com:urbit/urbit 2013-10-02 09:41:15 -07:00
johncburnham
9622727c2a Merge pull request #43 from philipcmonk/master
Add hoon.vim to extras folder.
2013-10-01 12:29:03 -07:00
Philip Monk
740ede9131 Merge remote-tracking branch 'vim/master' 2013-10-01 12:25:35 -07:00
Philip Monk
7c66dc7e9b Merge https://github.com/urbit/urbit 2013-10-01 12:22:04 -07:00
C. Guy Yarvin
4f8fb36800 Add Michael Hartl as ~den, ~lex, ~pyl. 2013-09-30 19:44:43 -07:00
C. Guy Yarvin
5167614325 Merge branch 'master' of github.com:urbit/urbit 2013-09-30 19:22:06 -07:00
C. Guy Yarvin
f0eee0f468 Add Pax Dickinson as ~wex. 2013-09-30 19:20:49 -07:00
johncburnham
4295e876b4 Merge pull request #41 from cdcarter/master
relatively tiny documentation changes
2013-09-30 18:45:15 -07:00
johncburnham
7bb08e8235 Merge pull request #40 from cdcarter/master
fix known bugs in hoon scripts Game and Pope
2013-09-30 18:29:44 -07:00
Christian Carter
48452e17ae fix known bugs in hoon scripts Game and Pope 2013-09-30 18:25:52 -07:00
cgyarvin
713f4de3ae Merge pull request #38 from nagydani/master
Assigned the ~lyt 8-bit key to myself (Daniel Nagy). The claim is based ...
2013-09-30 10:50:03 -07:00
Daniel A. Nagy
a9932b94d3 Assigned the ~lyt 8-bit key to myself (Daniel Nagy). The claim is based on solving the Nock Challenge in 2010. 2013-09-30 19:22:27 +02:00
C. Guy Yarvin
196ec8462f Add Dan Haffey as ~ryg. 2013-09-29 16:20:02 -07:00
johncburnham
688acb27c3 Merge pull request #33 from ab9/tighten_gitignore
Tighten .gitignore patterns
2013-09-29 11:53:25 -07:00
johncburnham
787b8664dd Merge pull request #36 from cdcarter/master
Still cleaning things up
2013-09-29 10:41:25 -07:00
Christian Carter
2b51f30e80 Merge remote-tracking branch 'upstread/master' 2013-09-29 09:20:27 -07:00
C. Guy Yarvin
457fd377a5 Merge branch 'master' of github.com:urbit/urbit 2013-09-28 23:55:54 -07:00
C. Guy Yarvin
6a54a6975f Add Zimran Ahmed as ~wyl. 2013-09-28 23:55:33 -07:00
johncburnham
c85f848d37 Merge pull request #31 from ab9/colinize
List Colin Smith (~sun) in zune
2013-09-28 18:47:58 -07:00
Aaron Beckerman
92997d5872 List Colin Smith in zune 2013-09-29 09:25:53 +08:00
C. Guy Yarvin
bba01a7e74 Add Zimran Ahmed as ~wyl. 2013-09-28 17:15:10 -07:00
ericfode
9977bfa8d7 init commit 2013-09-28 16:02:44 -07:00
C. Guy Yarvin
fba23aa8a5 Merge branch 'master' of github.com:urbit/urbit 2013-09-28 13:32:00 -07:00
Raymond Pasco
e4eae49cf9 There was a HISTORY here. It's gone now.
See urbit's archaeology repositories for older history.
2016-02-10 16:08:52 -05:00
cgyarvin
cee67e3d9a Merge pull request #30 from cdcarter/master
Cleaning up old code
2013-09-28 13:30:35 -07:00
Christian Carter
4caa90c68f Cleaning up old code 2013-09-28 13:21:18 -07:00