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

Merged trunk R.10943 back in

Browse source
This commit is contained in:
Wouter den Breejen 2008-03-04 12:15:55 +00:00
parent bffb03eae1
commit ab649814fc
5 changed files with 84 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mergeTrunkBackIn.sh
View file

@ -1,4 +1,4 @@
svn merge -r 10154:10531 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
svn merge -r 10855:10943 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
#already done:
# 8628
@ -31,3 +31,6 @@ svn merge -r 10154:10531 https://svn.cs.uu.nl:12443/repos/trace/nix/trunk
# 10133
# 10154
# 10531
# 10692
# 10855
# 10943