]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18b98ca 6d4a602)
Merge branch 'open-vm-tools'
authorroot <root@ipfire-build.rechtsabteilung>
Fri, 2 Jul 2010 20:00:02 +0000 (22:00 +0200)
committerroot <root@ipfire-build.rechtsabteilung>
Fri, 2 Jul 2010 20:00:02 +0000 (22:00 +0200)
1  2 
doc/packages-list.txt patch | diff1 | diff2 | blob | history

diff --cc doc/packages-list.txt
Simple merge
Peter's tree of IPFire 2.x