Merge branch 'master' of github.com:pagespeed/ngx_pagespeed

This commit is contained in:
Jeff Kaufman
2013-04-29 10:39:58 -04:00
2 changed files with 1 additions and 10 deletions
-8
View File
@@ -25,14 +25,6 @@
#include "ngx_pagespeed.h"
extern "C" {
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
#include <ngx_log.h>
}
#include <unistd.h>
#include <vector>
#include <set>
+1 -2
View File
@@ -28,13 +28,12 @@
#ifdef LOG_WARNING
#undef LOG_WARNING
#endif
#include "base/logging.h"
extern "C" {
#include <ngx_core.h>
#include <ngx_http.h>
}
#include "base/logging.h"
#include "net/instaweb/http/public/response_headers.h"
#include "net/instaweb/util/public/string_util.h"