about summary refs log tree commit diff stats
path: root/html.c
diff options
context:
space:
mode:
authorLars Hjemli2007-09-03 23:00:06 +0200
committerLars Hjemli2007-09-03 23:00:06 +0200
commitff13396926f3352d9e29c0663154918297dc5af7 (patch)
tree71979efc1ad17ab15a365f86ecb49dd128c65772 /html.c
parentUse git-1.5.3 as submodule (diff)
parentRename dirlink to gitlink. (diff)
downloadcgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.gz
cgit-ff13396926f3352d9e29c0663154918297dc5af7.zip
Merge branch 'jo/dirlink'
* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'html.c')
-rw-r--r--html.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/html.c b/html.c index 33a956f..76fa6c4 100644 --- a/html.c +++ b/html.c
@@ -158,7 +158,7 @@ void html_filemode(unsigned short mode)
158 html("d"); 158 html("d");
159 else if (S_ISLNK(mode)) 159 else if (S_ISLNK(mode))
160 html("l"); 160 html("l");
161 else if (S_ISDIRLNK(mode)) 161 else if (S_ISGITLINK(mode))
162 html("m"); 162 html("m");
163 else 163 else
164 html("-"); 164 html("-");