summaryrefslogtreecommitdiffstats
path: root/WebCore/page
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-09 11:06:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-09 11:06:12 -0700
commit775e2b17108eeab5071b460dc6f40177226e891b (patch)
treec7366e230a00333c9e72cf32310f03c66c95c12e /WebCore/page
parent6d43b9ceb777071c088fe12ee94af80e34816bcf (diff)
parentb34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010 (diff)
downloadexternal_webkit-775e2b17108eeab5071b460dc6f40177226e891b.zip
external_webkit-775e2b17108eeab5071b460dc6f40177226e891b.tar.gz
external_webkit-775e2b17108eeab5071b460dc6f40177226e891b.tar.bz2
am b34d9d68: merge from open-source master
Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010' * commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010': Fix missing NL
Diffstat (limited to 'WebCore/page')
-rw-r--r--WebCore/page/Connection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/page/Connection.cpp b/WebCore/page/Connection.cpp
index ffbb838..1031df3 100644
--- a/WebCore/page/Connection.cpp
+++ b/WebCore/page/Connection.cpp
@@ -36,4 +36,4 @@ Connection::ConnectionType Connection::type() const
return networkStateNotifier().type();
}
-}; \ No newline at end of file
+};