Merge branch 'jn/gitweb-blame'

* jn/gitweb-blame:
  gitweb: Add link to other blame implementation in blame views
  gitweb: Make linking to actions requiring JavaScript a feature
  gitweb.js: fix padLeftStr() and its usage
  gitweb.js: Harden setting blamed commit info in incremental blame
  gitweb.js: fix null object exception in initials calculation
  gitweb: Minify gitweb.js if JSMIN is defined
  gitweb: Create links leading to 'blame_incremental' using JavaScript
  gitweb: Colorize 'blame_incremental' view during processing
  gitweb: Incremental blame (using JavaScript)
  gitweb: Add optional "time to generate page" info in footer

Conflicts:
	Makefile
	gitweb/gitweb.css

diff --cc Makefile
index 4dba10e7f06d816741697356f402e2a2b5da3dbe,9b7dc036b6d6e3d3760e0c900a2aad600093d9d6..4a1e5bcc4def58a5d8f05a368fea69cde8ddb74e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -205,17 -199,8 +205,20 @@@ all:
  #
  # Define NO_REGEX if you have no or inferior regex support in your C library.
  #
+ # Define JSMIN to point to JavaScript minifier that functions as
+ # a filter to have gitweb.js minified.
++#
 +# Define DEFAULT_PAGER to a sensible pager command (defaults to "less") if
 +# you want to use something different.  The value will be interpreted by the
 +# shell at runtime when it is used.
 +#
 +# Define DEFAULT_EDITOR to a sensible editor command (defaults to "vi") if you
 +# want to use something different.  The value will be interpreted by the shell
 +# if necessary when it is used.  Examples:
 +#
 +#   DEFAULT_EDITOR='~/bin/vi',
 +#   DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',
 +#   DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork'
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        @$(SHELL_PATH) ./GIT-VERSION-GEN

diff --cc git-instaweb.sh
Simple merge

diff --cc gitweb/README
Simple merge

diff --cc gitweb/gitweb.css
index cb3f0baf05e8a48484132bb8936b4f46f22493ed,c101e4af75a56220cd4b404e9d13b658c1beef0c..50067f2e0dea2c1e17a41e9a5e8b2a8f6240c13d
--- 1/gitweb/gitweb.css
--- 2/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@@ -343,14 -351,19 +355,25 @@@ td.pre, div.pre, div.diff 
  
  td.mode {
        font-family: monospace;
+ }
+ 
+ /* progress of blame_interactive */
+ div#progress_bar {
+       height: 2px;
+       margin-bottom: -2px;
+       background-color: #d8d9d0;
+ }
+ div#progress_info {
+       float: right;
+       text-align: right;
  }
  
 +/* format of (optional) objects size in 'tree' view */
 +td.size {
 +      font-family: monospace;
 +      text-align: right;
 +}
 +
  /* styling of diffs (patchsets): commitdiff and blobdiff views */
  div.diff.header,
  div.diff.extended_header {

diff --cc gitweb/gitweb.perl
Simple merge