diff options
| author | Bert Münnich <be.muennich@gmail.com> | 2013-02-09 01:21:57 +0100 |
|---|---|---|
| committer | Bert Münnich <be.muennich@gmail.com> | 2013-02-09 01:21:57 +0100 |
| commit | bf4101249306669ebd5134fd0594376f00cb4538 (patch) | |
| tree | 01e03a5583ed97b9b0ec8ed4fb171285ebdc8baf /main.c | |
| parent | f7301cf4f9f93a00faecbf8701e690ba99ddac35 (diff) | |
| parent | 3f25b907bd1fbea563ddf335fb3d308094fa81c6 (diff) | |
| download | nsxiv-bf4101249306669ebd5134fd0594376f00cb4538.tar.zst | |
Merge remote-tracking branch '4z3/set-user-specified-sizehints' into sizehints
Conflicts:
window.c
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -26,7 +26,6 @@ #include <sys/select.h> #include <sys/stat.h> #include <sys/time.h> -#include <X11/Xutil.h> #include <X11/keysym.h> #include "types.h" |