summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-12 20:19:54 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-04-12 20:19:54 -0400
commitcd1b32453a9296c18b28bff71607aeb22987b5cd (patch)
treec653c6d525b471914c01a9d7ae543f521b6138ed /.gitignore
parentMerge pull request #1634 from aleksander/master (diff)
parentFix separator height calculation (diff)
downloadsway-cd1b32453a9296c18b28bff71607aeb22987b5cd.tar.gz
sway-cd1b32453a9296c18b28bff71607aeb22987b5cd.tar.zst
sway-cd1b32453a9296c18b28bff71607aeb22987b5cd.zip
Merge branch 'wlroots'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 48f8a0cb..1352970b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
1CMakeCache.txt
2CMakeFiles
3Makefile
4cmake_install.cmake
5install_manifest.txt 1install_manifest.txt
6*.swp 2*.swp
7*.o 3*.o
@@ -12,3 +8,5 @@ build/
12.lvimrc 8.lvimrc
13config-debug 9config-debug
14wayland-*-protocol.* 10wayland-*-protocol.*
11/subprojects/wlroots
12subprojects