Permalink
Browse files

Add a dependency I missed in a previous checkin.

Revert an unintentionally checked in change in viewer_window.cc.
Set svn:eol-style and cleanup end of line whitespace.

TBR=slightlyoff@chromium.org

Review URL: http://codereview.appspot.com/1172041

git-svn-id: http://sawbuck.googlecode.com/svn/trunk@60 15e8cca8-e42c-11de-a347-f34a4f72eb7d
  • Loading branch information...
1 parent 7c49cb8 commit 68e11dd0fadcab82590f782695d21429b62ce873 siggi@chromium.org committed May 8, 2010
Showing with 10 additions and 6 deletions.
  1. +4 −0 DEPS
  2. +5 −5 codereview.settings
  3. +1 −1 sawbuck/viewer/viewer_window.cc
View
4 DEPS
@@ -34,6 +34,10 @@ deps = {
Var("chrome_base") + "/src/third_party/wtl@" +
Var("chrome_revision"),
+ # NSS, for SSLClientSocketNSS.
+ "src/third_party/nss":
+ Var("chrome_base") + "/deps/third_party/nss@45059",
+
"src/third_party/zlib":
Var("chrome_base") + "/src/third_party/zlib@" +
Var("chrome_revision"),
View
@@ -1,5 +1,5 @@
-# This file is used by gcl to get repository specific information.
-CODE_REVIEW_SERVER: codereview.appspot.com
-VIEW_VC: http://code.google.com/p/sawbuck/source/browse/#svn/trunk
-CC_LIST: sawbuck-changes@googlegroups.com
-TRY_ON_UPLOAD: False
+# This file is used by gcl to get repository specific information.
+CODE_REVIEW_SERVER: codereview.appspot.com
+VIEW_VC: http://code.google.com/p/sawbuck/source/browse/#svn/trunk
+CC_LIST: sawbuck-changes@googlegroups.com
+TRY_ON_UPLOAD: False
@@ -385,7 +385,7 @@ void ViewerWindow::OnLogMessage(UCHAR level,
DWORD thread_id,
LARGE_INTEGER time_stamp,
size_t num_traces,
- const void** trace,
+ void** trace,
size_t length,
const char* message) {
AutoLock lock(list_lock_);

0 comments on commit 68e11dd

Please sign in to comment.