diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2014-05-17 11:39:56 +0100 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2014-05-17 11:39:56 +0100 |
| commit | 211b78f5369a61bb3ae72e882373c6823c7c202a (patch) | |
| tree | cf71f2cfbde33c0d0bc2e955088ec9a528179b25 /src/buffer.cc | |
| parent | e86e5b1b81253b0e6fa3fb3fb23070b4020ad36b (diff) | |
| parent | 9240cccf74ddf175eb0dac5005633d19e3068539 (diff) | |
Merge branch 'master' into remove-buffer-change-listener
Conflicts:
src/highlighters.cc
Diffstat (limited to 'src/buffer.cc')
0 files changed, 0 insertions, 0 deletions