summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-03-26 01:33:43 +0100
committerThomas Schwinge <thomas@schwinge.name>2011-03-26 01:33:43 +0100
commit48d63562b1eb3e1211fe2ad803a3df704f9c342c (patch)
treed26a58aba6e9ffc814e88f22529bfae9db9579bf /hurd
parent2ad64644b9290ed1b63108b01ef63939adba5a93 (diff)
parent0729272db4fe4563fee46488236d75e9c4700eee (diff)
Merge commit '0729272db4fe4563fee46488236d75e9c4700eee'
Conflicts: community/gsoc/project_ideas/libdiskfs_locking.mdwn
Diffstat (limited to 'hurd')
0 files changed, 0 insertions, 0 deletions