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