mirror of
https://github.com/NixOS/nix.git
synced 2025-11-26 12:10:59 +01:00
Merged trunk R9751 back in.
This commit is contained in:
parent
4e11da960c
commit
55b07d65b1
16 changed files with 294 additions and 20 deletions
|
|
@ -1,4 +1,4 @@
|
|||
svn merge -r 9561:9584 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
|
||||
svn merge -r 9584:9751 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
|
||||
|
||||
#already done:
|
||||
# 8628
|
||||
|
|
@ -27,4 +27,4 @@ svn merge -r 9561:9584 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
|
|||
# 9549
|
||||
# 9561
|
||||
# 9584
|
||||
|
||||
# 9751
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue