diff options
| author | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
| commit | 1ee61dbd0f6ab8cf9dfafb085707bd67cca50e70 (patch) | |
| tree | 502ff5ebd47df13e8bb432d379cab44532c54deb /.gitignore | |
| parent | 692d33bf8b752cc3b8a0b7f2b29c2b49dd4f718b (diff) | |
| parent | f0b3a71fbc72eeccf44bc6a6f6c39a80af918463 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -4,12 +4,10 @@ Makefile cmake_install.cmake install_manifest.txt .clang_complete -*.swp *.o *.a bin/ test/ build/ -.lvimrc wayland-*-protocol.* wlr-example.ini |