d7abc31f5a
Now I carefully re-merged all the conflicts and tested some builds. Hopefully it's all OK now. |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
.gitignore | ||
COPYING | ||
default.nix | ||
VERSION |
d7abc31f5a
Now I carefully re-merged all the conflicts and tested some builds. Hopefully it's all OK now. |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
.gitignore | ||
COPYING | ||
default.nix | ||
VERSION |