summary refs log tree commit diff
path: root/git
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-07-25 11:59:22 +0200
committerLars Hjemli <hjemli@gmail.com>2009-07-25 11:59:22 +0200
commit681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (patch)
tree3bfca05875524bee0e5444fb791707bc3e593dbd /git
parent7e5c048505efe1902fb476cc2cb3160ff7df013d (diff)
parent3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (diff)
Merge branch 'plain-etag'
Conflicts:
	ui-shared.c
Diffstat (limited to 'git')
0 files changed, 0 insertions, 0 deletions