Raymond Pasco
|
6dd1f8c5d9
|
Merge remote-tracking branch 'yebyen/master' into test
|
2015-09-10 07:10:36 -04:00 |
|
Kingdon
|
f0d6f92584
|
update reference
|
2015-09-10 00:56:13 -04:00 |
|
Philip C Monk
|
cd73e722fd
|
Merge branch 'pending'
|
2015-09-09 19:17:40 -04:00 |
|
Philip C Monk
|
5bdd1e4503
|
Merge branch 'clayhammer' into pending
Conflicts:
urb/urbit.pill
urb/zod/ape/dojo.hoon
urb/zod/arvo/zuse.hoon
urb/zod/lib/drum.hoon
urb/zod/lib/helm.hoon
urb/zod/lib/kiln.hoon
Also bumped protocol to 4
|
2015-09-09 19:15:26 -04:00 |
|
Philip C Monk
|
ba407c6d37
|
Merge branch 'master' into pending
|
2015-09-09 17:32:49 -04:00 |
|
Philip C Monk
|
57ebf20b44
|
Merge remote-tracking branch 'origin/test' into pending
|
2015-09-09 17:32:02 -04:00 |
|
Anton Dyudin
|
2b8b5872d7
|
Merge branch 'nobreach' into pending
|
2015-09-09 14:20:39 -07:00 |
|
Anton Dyudin
|
bdfe82f9a9
|
Merge branch 'pending' into test
|
2015-09-08 13:28:15 -07:00 |
|
vere
|
2f4da4c827
|
Merge branch 'pending' of https://github.com/urbit/urbit into pending
|
2015-09-08 19:24:45 +00:00 |
|
Raymond Pasco
|
cad8b3b20d
|
Merge remote-tracking branch 'chc4/socket' into test
|
2015-09-04 22:12:53 -04:00 |
|
Charlie Cummings
|
98760f8e38
|
hide libuv socket errors
|
2015-09-04 18:49:09 -04:00 |
|
Philip C Monk
|
a8d59bf7a3
|
performance improvements
|
2015-09-03 17:14:35 -04:00 |
|
Galen Wolfe-Pauly
|
2c593d4aac
|
Merge branch 'apps' into pending
|
2015-09-02 16:43:22 -07:00 |
|
Galen Wolfe-Pauly
|
1b05fe430c
|
Merge branch 'apps' into pending
|
2015-09-02 16:41:38 -07:00 |
|
Galen Wolfe-Pauly
|
b16bd89e11
|
Merge branch 'apps' into pending
|
2015-09-02 16:33:14 -07:00 |
|
Galen Wolfe-Pauly
|
01131f354b
|
Merge branch 'apps' into pending
|
2015-09-02 16:23:39 -07:00 |
|
Philip C Monk
|
240599a7b8
|
Merge branch 'apps' into pending
|
2015-09-02 16:40:37 -04:00 |
|
vere
|
e5100784de
|
Merge remote-tracking branch 'origin/pending'
|
2015-09-02 19:09:46 +00:00 |
|
Galen Wolfe-Pauly
|
09123011f5
|
formatting
|
2015-09-02 11:32:15 -07:00 |
|
Galen Wolfe-Pauly
|
37e4aa0b4f
|
contributing link, and why not .md?
|
2015-09-02 11:17:41 -07:00 |
|
vere
|
3ef7775340
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-09-01 17:41:10 +00:00 |
|
cgyarvin
|
5ab9b1c276
|
Merge pull request #395 from max19/debianrules
fix #394 (debian/rules)
|
2015-09-01 10:36:38 -07:00 |
|
Max G
|
0ead150172
|
fix #394 (debian/rules)
|
2015-09-01 19:41:34 +03:00 |
|
Anton Dyudin
|
50ba60b528
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-08-31 17:12:53 -07:00 |
|
Anton Dyudin
|
118b2c2b0e
|
Merge branch 'apps' into test
|
2015-08-31 17:06:12 -07:00 |
|
Galen Wolfe-Pauly
|
e3ba068424
|
compiled js conflict
|
2015-08-31 15:52:00 -07:00 |
|
Raymond Pasco
|
a239cff5cc
|
Merge branch 'contributing.md-hotfix' into test
|
2015-08-29 10:17:40 -04:00 |
|
Raymond Pasco
|
a49ad7a0a7
|
Clarify the situations when a new pill is needed
|
2015-08-29 10:13:04 -04:00 |
|
Alex Higgins
|
67bc87ab23
|
Fixed minor issues
|
2015-08-28 11:47:30 -05:00 |
|
Alex Higgins
|
941af0b677
|
Fix alignments in jets/f
|
2015-08-28 11:34:36 -05:00 |
|
Alex Higgins
|
c9262507f2
|
Fix alignments in jets/g
|
2015-08-28 09:14:14 -05:00 |
|
Alex Higgins
|
ab60143fac
|
Aligned stuff in down.c
|
2015-08-28 08:33:41 -05:00 |
|
Alex Higgins
|
150833ac5b
|
Fix alignments in jets/d
|
2015-08-28 08:26:00 -05:00 |
|
Alex Higgins
|
51c696cc33
|
Fix alignments in jets/b
|
2015-08-28 08:25:37 -05:00 |
|
Alex Higgins
|
736eb2875b
|
Fix alignment in jets/a
|
2015-08-28 08:25:19 -05:00 |
|
Alex Higgins
|
c12e8bdb8d
|
Cosmetic changes to all function arg alignments in jets/c
|
2015-08-27 21:23:01 -04:00 |
|
Alex Higgins
|
fb4c04694e
|
Cosmetic changes to jets/c/ functions
|
2015-08-27 19:48:39 -05:00 |
|
Raymond Pasco
|
2d11e3dd6c
|
Fix weird indentation on a couple jets
|
2015-08-27 16:05:53 -04:00 |
|
Anton Dyudin
|
85bda87f77
|
Merge branch 'apps' of https://github.com/urbit/urbit into apps
|
2015-08-27 11:11:33 -07:00 |
|
Raymond Pasco
|
3e808ad5ee
|
Merge remote-tracking branch 'cahiggins/fix_xeb' into test
Closes #284
|
2015-08-27 07:21:29 -04:00 |
|
Alex Higgins
|
b09cbbdb38
|
Use urbit types instead of size_t
|
2015-08-27 06:12:21 -05:00 |
|
Alex Higgins
|
34d8463bec
|
Remove faulty logic
|
2015-08-27 05:56:53 -05:00 |
|
Alex Higgins
|
c982805552
|
Fix if styling
|
2015-08-27 05:53:36 -05:00 |
|
Alex Higgins
|
fc6fc63a55
|
Fix header comment
|
2015-08-27 05:49:13 -05:00 |
|
Alex Higgins
|
46746cbdb1
|
Fix alignment
|
2015-08-27 05:38:24 -05:00 |
|
Alex Higgins
|
01faf1fa45
|
Jet ++xeb
|
2015-08-27 05:31:10 -05:00 |
|
Galen Wolfe-Pauly
|
62df17fd40
|
main .js
|
2015-08-26 18:01:28 -07:00 |
|
Philip C Monk
|
fd01e4f355
|
Merge branch 'apps' of https://github.com/urbit/urbit into work
|
2015-08-26 20:41:19 -04:00 |
|
Anton Dyudin
|
d9054734f2
|
Merge branch 'apps' of https://github.com/urbit/urbit into apps
|
2015-08-26 16:20:40 -07:00 |
|
Philip C Monk
|
8c28bb79ee
|
Merge branch 'apps' of https://github.com/urbit/urbit into work
|
2015-08-26 18:21:52 -04:00 |
|