Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 21 Jun 2010 06:21:27 +0000
(23:21 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 21 Jun 2010 06:21:27 +0000
(23:21 -0700)
* maint:
gitweb/Makefile: fix typo in gitweb.min.css rule
Conflicts:
gitweb/Makefile
gitweb/Makefile
patch
|
blob
|
history
raw
(from parent 1:
1f0eb51
)
diff --git
a/gitweb/Makefile
b/gitweb/Makefile
index d2584fedd8811a47c35d6f814c5b57e4a0fb2f2c..2fb7c2d77bbd5f2041341822859dce51ae504d83 100644
(file)
--- a/
gitweb/Makefile
+++ b/
gitweb/Makefile
@@
-103,7
+103,7
@@
GITWEB_FILES += static/gitweb.min.css
GITWEB_CSS = static/gitweb.min.css
all:: static/gitweb.min.css
static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS
- $(QUIET_GEN)$(CSSMIN) <$ >$@
+ $(QUIET_GEN)$(CSSMIN) <$
<
>$@
else
GITWEB_FILES += static/gitweb.css
endif