]> git.cameronkatri.com Git - cgit.git/commit
Merge branch 'jo/dirlink'
authorLars Hjemli <hjemli@gmail.com>
Mon, 3 Sep 2007 21:00:06 +0000 (23:00 +0200)
committerLars Hjemli <hjemli@gmail.com>
Mon, 3 Sep 2007 21:00:06 +0000 (23:00 +0200)
commitff13396926f3352d9e29c0663154918297dc5af7
tree71979efc1ad17ab15a365f86ecb49dd128c65772
parent4e7e8bf9616661bec0c9b9d9c50aca03e600f32b
parente651cb0d2dc2dbd458c51cdba8ae56e8629348cc
Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-diff.c
ui-tree.c