summaryrefslogtreecommitdiffstats
path: root/js/src/devtools
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-10-18 10:45:55 -0500
committerathenian200 <athenian200@outlook.com>2020-10-18 10:45:55 -0500
commit95b4e5084b7fbe62609cfe9680eed5db135a57c8 (patch)
treeeb7ca4ae3da96bf3049c3da41fc511ff3154515e /js/src/devtools
parent1fc996152b7a1b0f61287c85ddc1698013ea63c0 (diff)
parent87c4c77ad79f346d9104d9586c9928f30a500632 (diff)
downloadUXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.gz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.lz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.xz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into caret_color
Diffstat (limited to 'js/src/devtools')
-rw-r--r--js/src/devtools/gctrace/gcstats.cpp1
-rw-r--r--js/src/devtools/sharkctl.cpp1
-rw-r--r--js/src/devtools/sharkctl.h1
3 files changed, 0 insertions, 3 deletions
diff --git a/js/src/devtools/gctrace/gcstats.cpp b/js/src/devtools/gctrace/gcstats.cpp
index 865e65839..3775520dd 100644
--- a/js/src/devtools/gctrace/gcstats.cpp
+++ b/js/src/devtools/gctrace/gcstats.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/js/src/devtools/sharkctl.cpp b/js/src/devtools/sharkctl.cpp
index 7b2dc02ae..f1bbd4f01 100644
--- a/js/src/devtools/sharkctl.cpp
+++ b/js/src/devtools/sharkctl.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/js/src/devtools/sharkctl.h b/js/src/devtools/sharkctl.h
index f09ed8be3..42cacd863 100644
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -1,5 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */