diff options
| author | Doug Kearns <dougkearns@gmail.com> | 2009-03-29 12:34:05 +1100 |
|---|---|---|
| committer | Doug Kearns <dougkearns@gmail.com> | 2009-03-29 12:34:05 +1100 |
| commit | 3b667419f81866219dc902e55d2e25865c839c0e (patch) | |
| tree | 8117e123c586c305f2bf5160f1b83ab1b07f976c /common/content/tabs.js | |
| parent | a5c8ebcc5520a3c2ad1ccaf05df462e247917881 (diff) | |
| parent | 374297c5da4379fb0058dde4cf47c7c0a4797100 (diff) | |
| download | pentadactyl-3b667419f81866219dc902e55d2e25865c839c0e.tar.gz | |
Merge branch 'master' into xulmus
Conflicts:
License.txt
Diffstat (limited to 'common/content/tabs.js')
| -rw-r--r-- | common/content/tabs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/content/tabs.js b/common/content/tabs.js index 0b19514f..81d71fff 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net> +Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org> Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or |