aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arguments.c2
-rw-r--r--attributes.c2
-rw-r--r--cfg.c2
-rw-r--r--client.c2
-rw-r--r--cmd-attach-session.c2
-rw-r--r--cmd-bind-key.c2
-rw-r--r--cmd-break-pane.c2
-rw-r--r--cmd-capture-pane.c2
-rw-r--r--cmd-choose-buffer.c2
-rw-r--r--cmd-choose-client.c2
-rw-r--r--cmd-choose-tree.c2
-rw-r--r--cmd-clear-history.c2
-rw-r--r--cmd-clock-mode.c2
-rw-r--r--cmd-command-prompt.c2
-rw-r--r--cmd-confirm-before.c2
-rw-r--r--cmd-copy-mode.c2
-rw-r--r--cmd-delete-buffer.c2
-rw-r--r--cmd-detach-client.c2
-rw-r--r--cmd-display-message.c2
-rw-r--r--cmd-display-panes.c2
-rw-r--r--cmd-find-window.c2
-rw-r--r--cmd-has-session.c2
-rw-r--r--cmd-if-shell.c2
-rw-r--r--cmd-join-pane.c2
-rw-r--r--cmd-kill-pane.c2
-rw-r--r--cmd-kill-server.c2
-rw-r--r--cmd-kill-session.c2
-rw-r--r--cmd-kill-window.c2
-rw-r--r--cmd-list-buffers.c2
-rw-r--r--cmd-list-clients.c2
-rw-r--r--cmd-list-keys.c2
-rw-r--r--cmd-list-panes.c2
-rw-r--r--cmd-list-sessions.c2
-rw-r--r--cmd-list-windows.c2
-rw-r--r--cmd-list.c2
-rw-r--r--cmd-load-buffer.c2
-rw-r--r--cmd-lock-server.c2
-rw-r--r--cmd-move-window.c2
-rw-r--r--cmd-new-session.c2
-rw-r--r--cmd-new-window.c2
-rw-r--r--cmd-paste-buffer.c2
-rw-r--r--cmd-pipe-pane.c2
-rw-r--r--cmd-queue.c2
-rw-r--r--cmd-refresh-client.c2
-rw-r--r--cmd-rename-session.c2
-rw-r--r--cmd-rename-window.c2
-rw-r--r--cmd-resize-pane.c2
-rw-r--r--cmd-respawn-pane.c2
-rw-r--r--cmd-respawn-window.c2
-rw-r--r--cmd-rotate-window.c2
-rw-r--r--cmd-run-shell.c2
-rw-r--r--cmd-save-buffer.c2
-rw-r--r--cmd-select-layout.c2
-rw-r--r--cmd-select-pane.c2
-rw-r--r--cmd-select-window.c2
-rw-r--r--cmd-send-keys.c2
-rw-r--r--cmd-set-buffer.c2
-rw-r--r--cmd-set-environment.c2
-rw-r--r--cmd-set-option.c2
-rw-r--r--cmd-show-environment.c2
-rw-r--r--cmd-show-messages.c2
-rw-r--r--cmd-show-options.c2
-rw-r--r--cmd-source-file.c2
-rw-r--r--cmd-split-window.c2
-rw-r--r--cmd-string.c2
-rw-r--r--cmd-swap-pane.c2
-rw-r--r--cmd-swap-window.c2
-rw-r--r--cmd-switch-client.c2
-rw-r--r--cmd-unbind-key.c2
-rw-r--r--cmd-wait-for.c2
-rw-r--r--cmd.c2
-rw-r--r--colour.c2
-rw-r--r--compat/asprintf.c2
-rw-r--r--compat/bitstring.h1
-rw-r--r--compat/cfmakeraw.c2
-rw-r--r--compat/closefrom.c2
-rw-r--r--compat/daemon.c1
-rw-r--r--compat/fgetln.c1
-rw-r--r--compat/forkpty-aix.c2
-rw-r--r--compat/forkpty-hpux.c2
-rw-r--r--compat/forkpty-sunos.c2
-rw-r--r--compat/getopt.c2
-rw-r--r--compat/imsg-buffer.c1
-rw-r--r--compat/imsg.c1
-rw-r--r--compat/imsg.h1
-rw-r--r--compat/openat.c2
-rw-r--r--compat/setenv.c2
-rw-r--r--compat/strcasestr.c1
-rw-r--r--compat/strlcat.c1
-rw-r--r--compat/strlcpy.c1
-rw-r--r--compat/strsep.c1
-rw-r--r--compat/strtonum.c1
-rw-r--r--compat/tree.h1
-rw-r--r--compat/unvis.c1
-rw-r--r--compat/vis.c1
-rw-r--r--compat/vis.h1
-rw-r--r--control.c2
-rw-r--r--environ.c2
-rw-r--r--format.c2
-rw-r--r--grid-view.c2
-rw-r--r--grid.c2
-rw-r--r--input-keys.c2
-rw-r--r--input.c2
-rw-r--r--job.c2
-rw-r--r--key-bindings.c2
-rw-r--r--key-string.c2
-rw-r--r--layout-custom.c2
-rw-r--r--layout-set.c2
-rw-r--r--layout.c2
-rw-r--r--log.c2
-rw-r--r--mode-key.c2
-rw-r--r--names.c2
-rw-r--r--notify.c2
-rw-r--r--options-table.c2
-rw-r--r--options.c2
-rw-r--r--osdep-aix.c2
-rw-r--r--osdep-cygwin.c2
-rw-r--r--osdep-darwin.c2
-rw-r--r--osdep-dragonfly.c2
-rw-r--r--osdep-freebsd.c2
-rw-r--r--osdep-hpux.c2
-rw-r--r--osdep-linux.c2
-rw-r--r--osdep-netbsd.c2
-rw-r--r--osdep-openbsd.c2
-rw-r--r--osdep-sunos.c2
-rw-r--r--osdep-unknown.c2
-rw-r--r--paste.c2
-rw-r--r--resize.c2
-rw-r--r--screen-redraw.c2
-rw-r--r--screen-write.c2
-rw-r--r--screen.c2
-rw-r--r--server-client.c2
-rw-r--r--server-fn.c2
-rw-r--r--server-window.c2
-rw-r--r--server.c2
-rw-r--r--session.c2
-rw-r--r--signal.c2
-rw-r--r--status.c2
-rw-r--r--tmux.c2
-rw-r--r--tmux.h2
-rw-r--r--tools/fix-ids.sh8
-rw-r--r--tty-acs.c2
-rw-r--r--tty-keys.c2
-rw-r--r--tty-term.c2
-rw-r--r--tty.c2
-rw-r--r--utf8.c2
-rw-r--r--window-choose.c2
-rw-r--r--window-clock.c2
-rw-r--r--window-copy.c2
-rw-r--r--window.c2
-rw-r--r--xmalloc.c2
-rw-r--r--xterm-keys.c2
152 files changed, 127 insertions, 168 deletions
diff --git a/arguments.c b/arguments.c
index 98a4a06c..05ff97eb 100644
--- a/arguments.c
+++ b/arguments.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/attributes.c b/attributes.c
index f9871108..84e4f9c6 100644
--- a/attributes.c
+++ b/attributes.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
diff --git a/cfg.c b/cfg.c
index 18ab10f2..b3b86e76 100644
--- a/cfg.c
+++ b/cfg.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/client.c b/client.c
index 48cce926..042ec920 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index c2bede2e..160f2a8f 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-bind-key.c b/cmd-bind-key.c
index 8ac2b001..5d68d486 100644
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index 9a4b5cb6..0025167f 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index 776737e1..ce60b4c5 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
index 2bc3db64..19f5fba2 100644
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 827e08d6..5a1892f4 100644
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 9349d765..823d0423 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index 225a174f..e1342880 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-clock-mode.c b/cmd-clock-mode.c
index 35bc14da..80835813 100644
--- a/cmd-clock-mode.c
+++ b/cmd-clock-mode.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 1f43169d..22b1d84e 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 4b8d0421..0bf58449 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 52b98896..89335296 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-delete-buffer.c b/cmd-delete-buffer.c
index d22d09b1..42268b78 100644
--- a/cmd-delete-buffer.c
+++ b/cmd-delete-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-detach-client.c b/cmd-detach-client.c
index c5a73517..600554a4 100644
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-display-message.c b/cmd-display-message.c
index da73fba6..f3547b00 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index 12551d35..9ce89712 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-find-window.c b/cmd-find-window.c
index 8b2a3015..88e48798 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-has-session.c b/cmd-has-session.c
index 8dcd2d49..a873b204 100644
--- a/cmd-has-session.c
+++ b/cmd-has-session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 233fcee5..da0220ca 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index 32cdb31a..5603541a 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2011 George Nachman <tmux@georgester.com>
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index f6ee4417..f4735fd2 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-kill-server.c b/cmd-kill-server.c
index dca4198b..07d94302 100644
--- a/cmd-kill-server.c
+++ b/cmd-kill-server.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-kill-session.c b/cmd-kill-session.c
index 030276e2..d7e2a219 100644
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index 0ede41d9..d402acce 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-buffers.c b/cmd-list-buffers.c
index c10c09dc..8eb1610f 100644
--- a/cmd-list-buffers.c
+++ b/cmd-list-buffers.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index ccd89e18..292be722 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index d609036b..0733ee28 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index b3d9bd9e..7f62177b 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-sessions.c b/cmd-list-sessions.c
index 4969eab0..ea8f3e32 100644
--- a/cmd-list-sessions.c
+++ b/cmd-list-sessions.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 223c6b2b..5f73e8d2 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-list.c b/cmd-list.c
index 5687f324..0c75ed49 100644
--- a/cmd-list.c
+++ b/cmd-list.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 81d198e0..785a7011 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-lock-server.c b/cmd-lock-server.c
index a341f5e6..de76475d 100644
--- a/cmd-lock-server.c
+++ b/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-move-window.c b/cmd-move-window.c
index b39ece81..3064cd6e 100644
--- a/cmd-move-window.c
+++ b/cmd-move-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 5823e5e1..e244f885 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-new-window.c b/cmd-new-window.c
index ed1ce0e5..7f14b21a 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
index 1d9ceb12..580cb575 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c
index 9451938e..4ab1824e 100644
--- a/cmd-pipe-pane.c
+++ b/cmd-pipe-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-queue.c b/cmd-queue.c
index f3186f2a..a98fa9b6 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index edb2c6c1..f693872c 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-rename-session.c b/cmd-rename-session.c
index 5d4b61ae..481154ce 100644
--- a/cmd-rename-session.c
+++ b/cmd-rename-session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-rename-window.c b/cmd-rename-window.c
index f77fa062..2f677a48 100644
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c
index c3075edd..42f0f39a 100644
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c
index 72080410..47031539 100644
--- a/cmd-respawn-pane.c
+++ b/cmd-respawn-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c
index 5ad8297b..06102ed0 100644
--- a/cmd-respawn-window.c
+++ b/cmd-respawn-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c
index 6e44e767..859ff04a 100644
--- a/cmd-rotate-window.c
+++ b/cmd-rotate-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index d67ea34b..b47c2827 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index 2fd0e82a..47a263da 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index c3d2cab9..77137b74 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index d694fd08..5810eeab 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-select-window.c b/cmd-select-window.c
index 0e11c23d..f530f1fe 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index aecfc66f..7a4d97d5 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c
index 37d3763e..0ec362b3 100644
--- a/cmd-set-buffer.c
+++ b/cmd-set-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-set-environment.c b/cmd-set-environment.c
index b51969fc..83e63b48 100644
--- a/cmd-set-environment.c
+++ b/cmd-set-environment.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-set-option.c b/cmd-set-option.c
index c75f99c5..01d691d5 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-show-environment.c b/cmd-show-environment.c
index d1b86545..7737752f 100644
--- a/cmd-show-environment.c
+++ b/cmd-show-environment.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-show-messages.c b/cmd-show-messages.c
index fa843b6e..308668f1 100644
--- a/cmd-show-messages.c
+++ b/cmd-show-messages.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-show-options.c b/cmd-show-options.c
index 093072f5..a5011e72 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 0b277c25..e5710a0c 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
diff --git a/cmd-split-window.c b/cmd-split-window.c
index 6e50aa0b..f88b2f65 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-string.c b/cmd-string.c
index fd483070..db1723cb 100644
--- a/cmd-string.c
+++ b/cmd-string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 0e3cecb4..918a2e4f 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-swap-window.c b/cmd-swap-window.c
index c507ad5a..655b910c 100644
--- a/cmd-swap-window.c
+++ b/cmd-swap-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index e808fc7f..439f593b 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
index 72d9fd75..710210ce 100644
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd-wait-for.c b/cmd-wait-for.c
index 607ac84a..a3e85856 100644
--- a/cmd-wait-for.c
+++ b/cmd-wait-for.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/cmd.c b/cmd.c
index a8275f88..eeffe4c7 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/colour.c b/colour.c
index da1cb421..9e90596f 100644
--- a/colour.c
+++ b/colour.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/compat/asprintf.c b/compat/asprintf.c
index 66f00996..733fc81b 100644
--- a/compat/asprintf.c
+++ b/compat/asprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
*
diff --git a/compat/bitstring.h b/compat/bitstring.h
index 28817c08..8fc3423e 100644
--- a/compat/bitstring.h
+++ b/compat/bitstring.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: bitstring.h,v 1.5 2003/06/02 19:34:12 millert Exp $ */
/* $NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $ */
diff --git a/compat/cfmakeraw.c b/compat/cfmakeraw.c
index 3f8dc7e5..85b2c9bc 100644
--- a/compat/cfmakeraw.c
+++ b/compat/cfmakeraw.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2013 Dagobert Michelsen
* Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/compat/closefrom.c b/compat/closefrom.c
index 74714c13..591769dd 100644
--- a/compat/closefrom.c
+++ b/compat/closefrom.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2004-2005 Todd C. Miller <Todd.Miller@courtesan.com>
*
diff --git a/compat/daemon.c b/compat/daemon.c
index 661f7fd5..3e87874b 100644
--- a/compat/daemon.c
+++ b/compat/daemon.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: daemon.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
diff --git a/compat/fgetln.c b/compat/fgetln.c
index 08ddc840..a5c2489d 100644
--- a/compat/fgetln.c
+++ b/compat/fgetln.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $NetBSD: fgetln.c,v 1.3 2007/08/07 02:06:58 lukem Exp $ */
/*-
diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index 7638c528..fd558eb8 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
*
diff --git a/compat/forkpty-hpux.c b/compat/forkpty-hpux.c
index c72e096d..59130e1b 100644
--- a/compat/forkpty-hpux.c
+++ b/compat/forkpty-hpux.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
*
diff --git a/compat/forkpty-sunos.c b/compat/forkpty-sunos.c
index 0015bf48..554e51ac 100644
--- a/compat/forkpty-sunos.c
+++ b/compat/forkpty-sunos.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
*
diff --git a/compat/getopt.c b/compat/getopt.c
index 38c317cc..a93f368a 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c
index 2242e01e..450fdf1b 100644
--- a/compat/imsg-buffer.c
+++ b/compat/imsg-buffer.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: imsg-buffer.c,v 1.4 2014/06/30 00:25:17 deraadt Exp $ */
/*
diff --git a/compat/imsg.c b/compat/imsg.c
index c99cda1f..af0da44f 100644
--- a/compat/imsg.c
+++ b/compat/imsg.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: imsg.c,v 1.6 2014/06/30 00:26:22 deraadt Exp $ */
/*
diff --git a/compat/imsg.h b/compat/imsg.h
index 49a2aeb3..06fe1bc1 100644
--- a/compat/imsg.h
+++ b/compat/imsg.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: imsg.h,v 1.3 2013/12/26 17:32:33 eric Exp $ */
/*
diff --git a/compat/openat.c b/compat/openat.c
index 005235b4..5cd9e551 100644
--- a/compat/openat.c
+++ b/compat/openat.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
*
diff --git a/compat/setenv.c b/compat/setenv.c
index 43122ba5..6c7d29ec 100644
--- a/compat/setenv.c
+++ b/compat/setenv.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/*
* Copyright (c) 2010 Dagobert Michelsen
* Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/compat/strcasestr.c b/compat/strcasestr.c
index 5e03bbb0..aa74c017 100644
--- a/compat/strcasestr.c
+++ b/compat/strcasestr.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strcasestr.c,v 1.3 2006/03/31 05:34:55 deraadt Exp $ */
/* $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $ */
diff --git a/compat/strlcat.c b/compat/strlcat.c
index 1ba236e2..e081c4f6 100644
--- a/compat/strlcat.c
+++ b/compat/strlcat.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
diff --git a/compat/strlcpy.c b/compat/strlcpy.c
index 80e13a8f..d6e8e77c 100644
--- a/compat/strlcpy.c
+++ b/compat/strlcpy.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
/*
diff --git a/compat/strsep.c b/compat/strsep.c
index 0a7aa328..c44bc5b2 100644
--- a/compat/strsep.c
+++ b/compat/strsep.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strsep.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
diff --git a/compat/strtonum.c b/compat/strtonum.c
index 860e5508..4c7b0c9f 100644
--- a/compat/strtonum.c
+++ b/compat/strtonum.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $ */
/*
diff --git a/compat/tree.h b/compat/tree.h
index 73041340..80d0f538 100644
--- a/compat/tree.h
+++ b/compat/tree.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/compat/unvis.c b/compat/unvis.c
index 874b2275..e1f09ec9 100644
--- a/compat/unvis.c
+++ b/compat/unvis.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: unvis.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1989, 1993
diff --git a/compat/vis.c b/compat/vis.c
index da4ac7cd..97eb5271 100644
--- a/compat/vis.c
+++ b/compat/vis.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: vis.c,v 1.19 2005/09/01 17:15:49 millert Exp $ */
/*-
* Copyright (c) 1989, 1993
diff --git a/compat/vis.h b/compat/vis.h
index e43e9adc..d6ff235d 100644
--- a/compat/vis.h
+++ b/compat/vis.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $ */
/* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */
diff --git a/control.c b/control.c
index b0a031f7..0ace6c12 100644
--- a/control.c
+++ b/control.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/environ.c b/environ.c
index f04afd15..284f8b55 100644
--- a/environ.c
+++ b/environ.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/format.c b/format.c
index ba014b2c..eb87a5ba 100644
--- a/format.c
+++ b/format.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/grid-view.c b/grid-view.c
index e75b6049..badabd56 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/grid.c b/grid.c
index 521fb9fd..ef7c374b 100644
--- a/grid.c
+++ b/grid.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/input-keys.c b/input-keys.c
index 3b72c07e..da64865d 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/input.c b/input.c
index 12459675..fcc91180 100644
--- a/input.c
+++ b/input.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/job.c b/job.c
index d01472b0..023a1d47 100644
--- a/job.c
+++ b/job.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/key-bindings.c b/key-bindings.c
index 4ea40a1f..00f73d73 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/key-string.c b/key-string.c
index daf0783e..db968279 100644
--- a/key-string.c
+++ b/key-string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/layout-custom.c b/layout-custom.c
index e32d9d9d..c9cf49c2 100644
--- a/layout-custom.c
+++ b/layout-custom.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/layout-set.c b/layout-set.c
index 377002f4..64b655a0 100644
--- a/layout-set.c
+++ b/layout-set.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/layout.c b/layout.c
index 646d1bd9..b91b86cd 100644
--- a/layout.c
+++ b/layout.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/log.c b/log.c
index 6abbf435..250a1da2 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/mode-key.c b/mode-key.c
index 678114e5..77e7b695 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/names.c b/names.c
index 5c956259..8e01d347 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/notify.c b/notify.c
index bd5c7d83..47945aec 100644
--- a/notify.c
+++ b/notify.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2012 George Nachman <tmux@georgester.com>
diff --git a/options-table.c b/options-table.c
index 8d680b3c..2083f6a5 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/options.c b/options.c
index 67885c60..67f8abde 100644
--- a/options.c
+++ b/options.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-aix.c b/osdep-aix.c
index 8d590816..24051ab8 100644
--- a/osdep-aix.c
+++ b/osdep-aix.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-cygwin.c b/osdep-cygwin.c
index f28df376..f3a90426 100644
--- a/osdep-cygwin.c
+++ b/osdep-cygwin.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-darwin.c b/osdep-darwin.c
index dc60b092..7be70375 100644
--- a/osdep-darwin.c
+++ b/osdep-darwin.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
diff --git a/osdep-dragonfly.c b/osdep-dragonfly.c
index ad417d98..f9b0efcf 100644
--- a/osdep-dragonfly.c
+++ b/osdep-dragonfly.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-freebsd.c b/osdep-freebsd.c
index 9d1acb85..d7f419b8 100644
--- a/osdep-freebsd.c
+++ b/osdep-freebsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-hpux.c b/osdep-hpux.c
index 352e375b..4baa6d49 100644
--- a/osdep-hpux.c
+++ b/osdep-hpux.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-linux.c b/osdep-linux.c
index 1850d51b..ad4c11cd 100644
--- a/osdep-linux.c
+++ b/osdep-linux.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-netbsd.c b/osdep-netbsd.c
index f16d0dc8..15686860 100644
--- a/osdep-netbsd.c
+++ b/osdep-netbsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-openbsd.c b/osdep-openbsd.c
index 9e4df91d..7fe96d58 100644
--- a/osdep-openbsd.c
+++ b/osdep-openbsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/osdep-sunos.c b/osdep-sunos.c
index d071694e..855cac9d 100644
--- a/osdep-sunos.c
+++ b/osdep-sunos.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Todd Carson <toc@daybefore.net>
diff --git a/osdep-unknown.c b/osdep-unknown.c
index 41f435bc..4de1ee1e 100644
--- a/osdep-unknown.c
+++ b/osdep-unknown.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/paste.c b/paste.c
index ce1f27d3..7ec15062 100644
--- a/paste.c
+++ b/paste.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/resize.c b/resize.c
index b3b031c0..70379420 100644
--- a/resize.c
+++ b/resize.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/screen-redraw.c b/screen-redraw.c
index 6438034a..a7f713a5 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/screen-write.c b/screen-write.c
index b3555b61..37e2b548 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/screen.c b/screen.c
index c498ed55..8c41ead5 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/server-client.c b/server-client.c
index 6b3ba8ca..18eea9d9 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/server-fn.c b/server-fn.c
index 7db8668b..6cab6bd9 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/server-window.c b/server-window.c
index 61be1b80..a14c3150 100644
--- a/server-window.c
+++ b/server-window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/server.c b/server.c
index 0cfd2361..d58c8f38 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/session.c b/session.c
index 002155a9..3ac9fb2b 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/signal.c b/signal.c
index d24de7d2..7e6268a7 100644
--- a/signal.c
+++ b/signal.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/status.c b/status.c
index 19b0ec88..287039ed 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tmux.c b/tmux.c
index 7669d120..5a1988e2 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tmux.h b/tmux.h
index 964ed70b..23537a83 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tools/fix-ids.sh b/tools/fix-ids.sh
deleted file mode 100644
index 4621d2b4..00000000
--- a/tools/fix-ids.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-for i in *.[ch] tmux.1; do
- (head -1 $i|grep '$OpenBSD' >/dev/null) || continue
- mv $i $i~ || exit
- sed 's/\$OpenBSD.* \$/$\Id$/' $i~ >$i || exit
- echo $i
-done
diff --git a/tty-acs.c b/tty-acs.c
index 140ad4d6..5d03c3eb 100644
--- a/tty-acs.c
+++ b/tty-acs.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tty-keys.c b/tty-keys.c
index bbcbedfb..a987c44b 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tty-term.c b/tty-term.c
index 013cac1b..74c58319 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/tty.c b/tty.c
index e4bd2576..9f57c365 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/utf8.c b/utf8.c
index 58475405..39e708ba 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/window-choose.c b/window-choose.c
index 51116514..db092872 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/window-clock.c b/window-clock.c
index 9765b127..ede8df5b 100644
--- a/window-clock.c
+++ b/window-clock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/window-copy.c b/window-copy.c
index c91aac8f..b1301676 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/window.c b/window.c
index 2b215db1..4d8cd1c5 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/xmalloc.c b/xmalloc.c
index 4c24d0d8..b1570a3a 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/xterm-keys.c b/xterm-keys.c
index b0b8a37d..5ca75d89 100644
--- a/xterm-keys.c
+++ b/xterm-keys.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>