]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0391ac2 4251530)
Merge pull request #1575 from hwangcc23/next
authorMichael Stapelberg <stapelberg@users.noreply.github.com>
Sun, 29 Mar 2015 14:53:14 +0000 (16:53 +0200)
committerMichael Stapelberg <stapelberg@users.noreply.github.com>
Sun, 29 Mar 2015 14:53:14 +0000 (16:53 +0200)
Fix warnings

1  2 
i3-nagbar/main.c patch | diff1 | diff2 | blob | history
i3bar/src/child.c patch | diff1 | diff2 | blob | history
i3bar/src/ipc.c patch | diff1 | diff2 | blob | history

diff --cc i3-nagbar/main.c
Simple merge
diff --cc i3bar/src/child.c
Simple merge
diff --cc i3bar/src/ipc.c
Simple merge
A better tiling and dynamic window manager