Anton Dyudin
c985287a00
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-07-15 11:57:53 -07:00
Philip C Monk
bb67eace1e
Merge remote-tracking branch 'origin/master' into pending
...
Conflicts:
urb/zod/dog/hood/begin.hoon
2015-07-14 18:58:14 -04:00
Philip C Monk
4b9eebd2cb
Merge remote-tracking branch 'origin/test' into pending
...
Conflicts:
urb/urbit.pill
2015-07-14 18:56:05 -04:00
Anton Dyudin
beace76836
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-07-14 15:31:32 -07:00
Philip C Monk
f2f3d42973
Merge branch 'pending' of https://github.com/urbit/urbit into pending
2015-07-14 17:08:07 -04:00
Philip C Monk
7cce82059d
off-by-one error when checking for deleted childs
...
fixes #365
2015-07-14 17:07:12 -04:00
C. Guy Yarvin
46d4373103
Abort on oops/foul.
2015-07-14 11:58:46 -07:00
C. Guy Yarvin
7266771bf9
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-07-14 11:57:29 -07:00
C. Guy Yarvin
67138a7961
Abort for oops or foul.
2015-07-14 11:57:02 -07:00
Philip C Monk
cbc45ff57a
couple readme fixes
2015-07-14 14:46:58 -04:00
Galen Wolfe-Pauly
b4cca224d1
Merge branch 'master' of github.com:urbit/urbit
2015-07-14 11:33:36 -07:00
Galen Wolfe-Pauly
94c6ec0739
mount instructions in readme. closes #363
2015-07-14 11:33:24 -07:00
Anton Dyudin
c428adedaa
aesthetic improvement
2015-07-13 17:46:37 -07:00
Philip C Monk
07d129a3c9
Merge remote-tracking branch 'origin/test'
...
Conflicts:
urb/urbit.pill
2015-07-13 16:09:26 -04:00
Anton Dyudin
b2a727acf0
Merge branch 'test' of https://github.com/urbit/urbit into test
...
Conflicts:
urb/urbit.pill
2015-07-06 13:28:30 -07:00
Jared Hance
a26d87db72
Fix documentation
...
A commit from the notorious batbus.
Homebrew-specific comments really shouldn't be in the FreeBSD section, though.
2015-07-04 22:04:14 -07:00
Raymond Pasco
1c76704d56
whoops, left in deliberate memory leaks...
...
also closes #338
2015-07-02 12:52:26 -04:00
Raymond Pasco
a649440ed2
set difference jets
2015-07-02 01:25:13 -04:00
Philip C Monk
d109de1dbc
cosmetic
2015-07-01 18:28:55 -04:00
Philip C Monk
a9b7a5c0c6
Merge remote-tracking branch 'origin/newunix' into test
...
Conflicts:
urb/urbit.pill
urb/zod/ape/hood.hoon
2015-06-29 16:04:16 -04:00
Philip C Monk
a1a6f1e00e
Merge remote-tracking branch 'origin/master' into newunix
...
Conflicts:
urb/urbit.pill
2015-06-29 15:40:14 -04:00
cgyarvin
2d23ec985c
Merge pull request #343 from max19/master
...
minor scrypt tweaks
2015-06-26 12:33:43 -07:00
Max G
fba3768e61
Merge remote-tracking branch 'upstream/master'
2015-06-26 21:26:04 +03:00
Anton Dyudin
5b71944a27
Merge branch 'newunix' of https://github.com/urbit/urbit into newunix
2015-06-24 12:51:36 -07:00
Anton Dyudin
cfe0339761
Rename %time to %behn, tym to now; closes #334
2015-06-24 12:50:30 -07:00
Raymond Pasco
c7ef30168a
fix build with longer filenames
2015-06-24 12:43:19 -07:00
Philip C Monk
9edda1bb73
descriptive names for c files
...
fixes #294
2015-06-23 21:29:11 -04:00
Philip C Monk
c05e6da07e
Merge remote-tracking branch 'origin/newunix'
...
Conflicts:
urb/urbit.pill
urb/zod/base/mar/bit-accounts.hoon
urb/zod/base/mar/bit-addr-made.hoon
urb/zod/base/mar/bit-addr-request.hoon
urb/zod/base/mar/bit-api-call.hoon
urb/zod/base/mar/bit-get-token.hoon
urb/zod/base/mar/bit-transaction.hoon
urb/zod/base/mar/bit/accounts.hoon
urb/zod/base/mar/bit/addr-made.hoon
urb/zod/base/mar/bit/addr-request.hoon
urb/zod/base/mar/bit/api-call.hoon
urb/zod/base/mar/bit/get-token.hoon
urb/zod/base/mar/bit/transaction.hoon
urb/zod/base/mar/cloud-auth.hoon
urb/zod/base/mar/cloud-secret.hoon
urb/zod/base/mar/cloud/auth.hoon
urb/zod/base/mar/cloud/secret.hoon
urb/zod/base/mar/dill-belt.hoon
urb/zod/base/mar/dill-blit.hoon
urb/zod/base/mar/dill/belt.hoon
urb/zod/base/mar/dill/blit.hoon
urb/zod/base/mar/oct3-move.hoon
urb/zod/base/mar/oct3-update.hoon
urb/zod/base/mar/oct3/move.hoon
urb/zod/base/mar/oct3/update.hoon
urb/zod/base/mar/oct4-move.hoon
urb/zod/base/mar/oct4-update.hoon
urb/zod/base/mar/oct4/move.hoon
urb/zod/base/mar/oct4/update.hoon
urb/zod/base/mar/sole-action.hoon
urb/zod/base/mar/sole-effect.hoon
urb/zod/base/mar/sole/action.hoon
urb/zod/base/mar/sole/effect.hoon
urb/zod/base/mar/talk-command.hoon
urb/zod/base/mar/talk-report.hoon
urb/zod/base/mar/talk/command.hoon
urb/zod/base/mar/talk/report.hoon
urb/zod/mar/bit-accounts.hoon
urb/zod/mar/bit-addr-made.hoon
urb/zod/mar/bit-addr-request.hoon
urb/zod/mar/bit-api-call.hoon
urb/zod/mar/bit-get-token.hoon
urb/zod/mar/bit-transaction.hoon
urb/zod/mar/cloud-auth.hoon
urb/zod/mar/cloud-auth/door.hook
urb/zod/mar/cloud-secret.hoon
urb/zod/mar/cloud-secret/door.hook
urb/zod/mar/dill-belt.hoon
urb/zod/mar/dill-blit.hoon
urb/zod/mar/oct3-move.hoon
urb/zod/mar/oct3-update.hoon
urb/zod/mar/oct4-move.hoon
urb/zod/mar/oct4-update.hoon
urb/zod/mar/sole-action.hoon
urb/zod/mar/sole-effect.hoon
urb/zod/mar/talk-command.hoon
urb/zod/mar/talk-report.hoon
2015-06-23 19:28:46 -04:00
Anton Dyudin
9d80d94843
recursively build cores, marks
2015-06-23 15:59:48 -07:00
Galen Wolfe-Pauly
fdaa5849db
Merge pull request #333 from yebyen/master
...
debian build deps
2015-06-23 12:15:07 -07:00
Kingdon Barrett
611a1ea096
debian build deps
2015-06-23 15:11:28 -04:00
cgyarvin
9b216f615d
Merge pull request #332 from dcow/parallel
...
Enable parallel builds (292)
2015-06-23 11:20:52 -07:00
David Cowden
1a40d36428
Enable parallel builds
...
Due to the earlier hack employed to enable `make distclean all`,
building urbit in parallel is not safe as it is possible `make`
will try to execute the rule that configures libuv twice at the
same time (since it is specified by two targets and no further
dependency exists). This change adds a dependency between the
two targets forcing them to be serialized by `make`.
libuv does not want to build in parallel either. Force it to
build sequentially too.
292
2015-06-23 10:08:19 -07:00
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
41b25f7bfe
urb/zod/base -> urb/zod
2015-06-19 17:16:48 -04:00
Philip C Monk
8a17c2fa25
Merge branch 'newunix'
...
Conflicts:
urb/zod/base/ape/dojo.hoon
urb/zod/base/ape/talk.hoon
2015-06-19 17:03:42 -04: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
C. Guy Yarvin
399a68ed2a
Remove debugging abort.
2015-06-19 09:28:06 -07: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
Galen Wolfe-Pauly
6aa849fc15
Merge pull request #309 from rastus-vernon/patch-2
...
Fixes to the command to install dependencies on Fedora
2015-06-18 08:38:44 -07:00
Rastus Vernon
506081af01
Use DNF instead of Yum for Fedora
...
Yum has been deprecated in favor of DNF in the latest stable Fedora
version and is no longer part of the base system. For this reason, the
command to install dependencies on Fedora should be changed to DNF.
2015-06-18 03:26:06 -04:00
