diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-20 23:21:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-20 23:21:27 -0700 |
| commit | b43688a5bc2eaa8a5805856fc11dc3cd60e6e6ac (patch) | |
| tree | 32c76821afb58cb0e69b667f9cd1947895492807 /gitweb | |
| parent | 1f0eb51391d58958dd9f1e6cbcba622c309303b2 (diff) | |
| parent | 70649945c215b1674611a40eda1d0058118a6d1a (diff) | |
| download | git-b43688a5bc2eaa8a5805856fc11dc3cd60e6e6ac.tar.gz | |
Merge branch 'maint'
* maint:
gitweb/Makefile: fix typo in gitweb.min.css rule
Conflicts:
gitweb/Makefile
Diffstat (limited to 'gitweb')
| -rw-r--r-- | gitweb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index d2584fedd8..2fb7c2d77b 100644 --- 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 |