nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 12:10:59 +01:00
Code Activity

Merged trunk back in: 10154->10531.

Browse source
This commit is contained in:
Wouter den Breejen 2008-02-06 23:58:00 +00:00
parent a34a198006
commit 2bf4fcb7cd
15 changed files with 250 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mergeTrunkBackIn.sh
View file

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