Anton Dyudin
ab3bf3a2d3
Merge branch 'test' into newunix
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/zuse.hoon
2015-06-22 17:19:55 -07:00
Philip C Monk
4bb801614a
Merge remote-tracking branch 'origin/test' into newunix
...
Conflicts:
urb/urbit.pill
urb/zod/base/ape/hood.hoon
urb/zod/base/arvo/zuse.hoon
v/unix.c
2015-06-19 15:37:20 -04:00
Philip C Monk
2c08e416ba
remove printfs
2015-06-19 15:26:11 -04:00
Philip C Monk
cded2d2822
good guys win
2015-06-19 15:09:33 -04:00
Raymond Pasco
6ad239df48
i guess we include git in the prereqs list
2015-06-19 04:07:46 +00:00
Raymond Pasco
7fdcc66815
Port to FreeBSD
2015-06-18 20:52:38 -07:00
Raymond Pasco
ea7bd8e695
u3_Signal should be a sigjmp_buf, not a jmp_buf
2015-06-18 20:32:04 -07:00
Philip C Monk
73852b5bad
fix mounting single files
2015-06-18 23:06:30 -04:00
Philip C Monk
7b1ee48422
deleted deleteme's
2015-06-18 21:50:47 -04:00
Philip C Monk
f80fce37c1
die, memory leaks, die
2015-06-18 18:14:47 -04:00
Philip C Monk
aa631b4359
bug fixes
2015-06-18 17:44:12 -04:00
Philip C Monk
932273b120
bug fixes
2015-06-18 15:56:11 -04:00
Philip C Monk
981c824af3
bug fixes
2015-06-17 20:06:14 -04:00
Philip C Monk
12e0ea2a9b
add :+unmount
2015-06-17 19:44:00 -04:00
Anton Dyudin
bfdc49c190
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-17 16:11:40 -07:00
Anton Dyudin
28f4b31a98
updated .gitignore
2015-06-17 14:09:34 -07:00
Anton Dyudin
6fff94e254
Merge branch 'master' into test
...
Conflicts:
urb/zod/base/pub/tree/src/js/main.js
2015-06-17 13:20:11 -07:00
Philip C Monk
b1c25114bf
persist mount points across pier reboots
2015-06-17 15:06:40 -04:00
Raymond Pasco
5356f9268a
AWS needs c++
2015-06-17 14:34:25 -04:00
Galen Wolfe-Pauly
652c5afcd2
Merge branch 'master' of github.com:urbit/urbit
2015-06-17 10:21:29 -07:00
Galen Wolfe-Pauly
f28fcb1d7e
register -> begin
2015-06-17 10:21:25 -07:00
Galen Wolfe-Pauly
0740c31020
Merge pull request #298 from Tenari/patch-1
...
typo fix
2015-06-16 18:58:45 -07:00
Daniel Zapata
223a534e16
typo fix
2015-06-16 20:56:58 -05:00
Galen Wolfe-Pauly
47857f071d
new readme
2015-06-16 18:27:28 -07:00
Galen Wolfe-Pauly
d4e76bf750
simpler readme
2015-06-16 18:25:32 -07:00
Philip C Monk
542b6f843a
dealt with some memory leaks
2015-06-16 19:48:34 -04:00
Anton Dyudin
13fce572ea
Merge branch 'master' into test
...
Conflicts:
urb/urbit.pill
urb/zod/base/mar/oct3-move.hoon
urb/zod/base/pub/cloud/fab/hymn.hook
urb/zod/base/pub/cloud/src/main.js
2015-06-16 15:19:51 -07:00
Anton Dyudin
3182574f0d
clarified bootup printf
2015-06-16 15:03:11 -07:00
Philip C Monk
6ad8eb401e
Merge remote-tracking branch 'origin/test' into newunix
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/clay.hoon
2015-06-16 17:44:47 -04:00
Philip C Monk
88e1296dbb
ergo merges
2015-06-16 17:34:21 -04:00
Anton Dyudin
f116c42320
Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.", "DEMO ONLY: don't show doznec flapping.", "Prinrtf."
...
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
This reverts commit 30a397513f8890a3406dc7ab91c6e067e3bbfbbb.
This reverts commit 4fc6856fb50d88c20a0f533392ca606641c5f38f.
Conflicts:
urb/urbit.pill
urb/zod/base/lib/drum.hoon
2015-06-15 18:10:02 -07:00
Anton Dyudin
af55a9e6bd
Merge branch 'test' into demo
...
Conflicts:
urb/urbit.pill
urb/zod/base/ape/hood.hoon
urb/zod/base/mar/hoon.hoon
2015-06-15 15:06:59 -07:00
Anton Dyudin
4559ddefde
Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.""
...
This reverts commit b07f8c81db3f7ab0a10d1b8ddc58de7c593612fc.
Conflicts:
urb/urbit.pill
urb/zod/base/pub/doc/guide/a-ford.md
urb/zod/base/pub/doc/hoon/library/3bg.md
2015-06-15 14:56:52 -07:00
Philip C Monk
cfa127d574
better mug checking
2015-06-15 17:52:35 -04:00
Philip C Monk
894f9726be
more fixes
2015-06-12 21:01:37 -04:00
Philip C Monk
3a8e368182
fixed more problems
2015-06-12 20:48:16 -04:00
Philip Monk
fe19cb23e7
Merge pull request #291 from rastus-vernon/patch-1
...
Fix copyright notice
2015-06-11 22:23:33 -07:00
Rastus Vernon
11edba2f08
Change copyright owner to "Urbit"
...
The copyright notice mentioned the Free Software Foundation, while the
LICENSE.txt file mentions simply "Urbit". It makes sense to change it to
the latter.
Also added myself to contributors.
2015-06-12 01:19:54 -04:00
Rastus Vernon
933ad886c2
Fix the copyright year
2015-06-12 01:05:22 -04:00
Philip C Monk
4f842a38f8
mount mostly works
2015-06-11 23:52:42 -04:00
Philip C Monk
6f21b511a2
put c errors in stack trace
2015-06-10 23:59:08 -04:00
Henry Ault
4f695e3c25
Merge branch 'demo' of https://github.com/urbit/urbit into demo
2015-06-10 17:01:46 -07:00
ault011
138ca1c14b
updated :+helm?begin to :?begin
2015-06-09 17:31:27 -07:00
C. Guy Yarvin
bb26600c9c
Merge branch 'demo' of https://github.com/urbit/urbit into demo
2015-06-09 16:12:53 -07:00
C. Guy Yarvin
5a7fa107c2
No file limit.
2015-06-09 16:12:36 -07:00
Philip C Monk
1b09820284
boots!
2015-06-09 17:09:02 -04:00
Philip C Monk
e903c71c78
all compiles
2015-06-09 16:55:07 -04:00
Philip C Monk
cb7a824c18
added %ogre handling
2015-06-09 13:27:22 -04:00
Galen Wolfe-Pauly
f004dec212
Merge branch 'demo' of github.com:urbit/urbit into demo
2015-06-09 10:12:10 -07:00
C. Guy Yarvin
0cacc4ed49
Proper auto directory name.
2015-06-09 01:54:43 -07:00
