nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-06-24 21:22:44 +02:00
parent 23c28e5208 27a5cceb61
commit 97a5fb2ec0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,7 @@
*.o *.o
tags tags
include/loglevels.h include/loglevels.h
include/GENERATED_*.h
loglevels.tmp loglevels.tmp
*.swp *.swp
*.gcda *.gcda
@ -8,6 +9,7 @@ loglevels.tmp
testcases/testsuite-* testcases/testsuite-*
testcases/latest testcases/latest
testcases/Makefile testcases/Makefile
test.commands_parser
*.output *.output
*.tab.* *.tab.*
*.yy.c *.yy.c
@ -32,5 +34,6 @@ i3-input/i3-input
i3-nagbar/i3-nagbar i3-nagbar/i3-nagbar
i3-msg/i3-msg i3-msg/i3-msg
i3-config-wizard/i3-config-wizard i3-config-wizard/i3-config-wizard
i3-dump-log/i3-dump-log
libi3/libi3.a libi3/libi3.a
docs/*.pdf docs/*.pdf