From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 3 Sep 2007 21:00:06 +0000 (+0200)
Subject: Merge branch 'jo/dirlink'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/ff13396926f3352d9e29c0663154918297dc5af7?ds=inline;hp=ff13396926f3352d9e29c0663154918297dc5af7

Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---