nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-25 19:51:00 +01:00
Code Activity

Merged the Nix sources from the trunk from R9751 to R10133 for my State Nix project.

Browse source
This commit is contained in:
Wouter den Breejen 2008-01-13 16:36:27 +00:00
parent 55b07d65b1
commit a34a198006
46 changed files with 1323 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mergeTrunkBackIn.sh
View file

@ -1,4 +1,4 @@
svn merge -r 9584:9751 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
svn merge -r 9751:10133 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
#already done:
# 8628
@ -28,3 +28,4 @@ svn merge -r 9584:9751 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
# 9561
# 9584
# 9751
# 10133 TODO