Merge branch 'obsd-master'

Conflicts:
	tmux.1
	tmux.c
tree: 8704cc16b1ed5380bcd7c678351d85adfd5907c8
  1. .gitignore
  2. .mailmap
  3. CHANGES
  4. COPYING
  5. FAQ
  6. Makefile.am
  7. README
  8. SYNCING
  9. TODO
  10. arguments.c
  11. array.h
  12. attributes.c
  13. autogen.sh
  14. cfg.c
  15. client.c
  16. clock.c
  17. cmd-attach-session.c
  18. cmd-bind-key.c
  19. cmd-break-pane.c
  20. cmd-capture-pane.c
  21. cmd-choose-buffer.c
  22. cmd-choose-client.c
  23. cmd-choose-list.c
  24. cmd-choose-tree.c
  25. cmd-clear-history.c
  26. cmd-clock-mode.c
  27. cmd-command-prompt.c
  28. cmd-confirm-before.c
  29. cmd-copy-mode.c
  30. cmd-delete-buffer.c
  31. cmd-detach-client.c
  32. cmd-display-message.c
  33. cmd-display-panes.c
  34. cmd-find-window.c
  35. cmd-has-session.c
  36. cmd-if-shell.c
  37. cmd-join-pane.c
  38. cmd-kill-pane.c
  39. cmd-kill-server.c
  40. cmd-kill-session.c
  41. cmd-kill-window.c
  42. cmd-link-window.c
  43. cmd-list-buffers.c
  44. cmd-list-clients.c
  45. cmd-list-commands.c
  46. cmd-list-keys.c
  47. cmd-list-panes.c
  48. cmd-list-sessions.c
  49. cmd-list-windows.c
  50. cmd-list.c
  51. cmd-load-buffer.c
  52. cmd-lock-server.c
  53. cmd-move-window.c
  54. cmd-new-session.c
  55. cmd-new-window.c
  56. cmd-paste-buffer.c
  57. cmd-pipe-pane.c
  58. cmd-queue.c
  59. cmd-refresh-client.c
  60. cmd-rename-session.c
  61. cmd-rename-window.c
  62. cmd-resize-pane.c
  63. cmd-respawn-pane.c
  64. cmd-respawn-window.c
  65. cmd-rotate-window.c
  66. cmd-run-shell.c
  67. cmd-save-buffer.c
  68. cmd-select-layout.c
  69. cmd-select-pane.c
  70. cmd-select-window.c
  71. cmd-send-keys.c
  72. cmd-set-buffer.c
  73. cmd-set-environment.c
  74. cmd-set-option.c
  75. cmd-show-environment.c
  76. cmd-show-messages.c
  77. cmd-show-options.c
  78. cmd-source-file.c
  79. cmd-split-window.c
  80. cmd-string.c
  81. cmd-suspend-client.c
  82. cmd-swap-pane.c
  83. cmd-swap-window.c
  84. cmd-switch-client.c
  85. cmd-unbind-key.c
  86. cmd-unlink-window.c
  87. cmd-wait-for.c
  88. cmd.c
  89. colour.c
  90. compat.h
  91. compat/
  92. configure.ac
  93. control-notify.c
  94. control.c
  95. environ.c
  96. examples/
  97. format.c
  98. grid-cell.c
  99. grid-view.c
  100. grid.c
  101. input-keys.c
  102. input.c
  103. job.c
  104. key-bindings.c
  105. key-string.c
  106. layout-custom.c
  107. layout-set.c
  108. layout.c
  109. log.c
  110. mdoc2man.awk
  111. mode-key.c
  112. names.c
  113. notify.c
  114. options-table.c
  115. options.c
  116. osdep-aix.c
  117. osdep-darwin.c
  118. osdep-dragonfly.c
  119. osdep-freebsd.c
  120. osdep-hpux.c
  121. osdep-linux.c
  122. osdep-netbsd.c
  123. osdep-openbsd.c
  124. osdep-sunos.c
  125. osdep-unknown.c
  126. paste.c
  127. resize.c
  128. screen-redraw.c
  129. screen-write.c
  130. screen.c
  131. server-client.c
  132. server-fn.c
  133. server-window.c
  134. server.c
  135. session.c
  136. signal.c
  137. status.c
  138. style.c
  139. tmux.1
  140. tmux.c
  141. tmux.h
  142. tools/
  143. tty-acs.c
  144. tty-keys.c
  145. tty-term.c
  146. tty.c
  147. utf8.c
  148. window-choose.c
  149. window-clock.c
  150. window-copy.c
  151. window.c
  152. www/
  153. xmalloc.c
  154. xterm-keys.c