Merge branch 'jc/streaming-filter'

diff --git a/gitweb/Makefile b/gitweb/Makefile
index 403265a9b24c3754839b3d8bc4351691e5af5750..5d20515fba9251123e29be623178047d4131fc01 100644 (file)
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -118,7 +118,9 @@ GITWEB_FILES += static/git-logo.png static/git-favicon.png
 # then the rest of files; js/gitweb.js should be last (if it exists)
 GITWEB_JSLIB_FILES += static/js/lib/common-lib.js
 GITWEB_JSLIB_FILES += static/js/lib/datetime.js
+GITWEB_JSLIB_FILES += static/js/lib/cookies.js
 GITWEB_JSLIB_FILES += static/js/javascript-detection.js
+GITWEB_JSLIB_FILES += static/js/adjust-timezone.js
 GITWEB_JSLIB_FILES += static/js/blame_incremental.js