Commit Graph

2 Commits

Author SHA1 Message Date
Elliot Glaysher
3af13630cf Merge branch 'rings' of github.com:urbit/urbit into rings 2019-06-24 13:51:18 -07:00
Elliot Glaysher
496e62e01d Merge branch 'cc-release' into rings
This translates the meson build to nix. Previously, we had our ge-additions
package just manually compiled in instead of having its own file.
2019-06-24 13:47:53 -07:00