Merge branch 'wmdrawer' into next
commit529ee0bd215f21a3c84259d8a2503e0dccfa4f7a
authorCarlos R. Mafra <crmafra@gmail.com>
Fri, 12 Apr 2013 01:14:41 +0000 (12 02:14 +0100)
committerCarlos R. Mafra <crmafra@gmail.com>
Fri, 12 Apr 2013 01:14:41 +0000 (12 02:14 +0100)
tree79c0769cc2405aa195a975c8bff8e1b19ce7cd0c
parent46c8d6d2bf2d8a90cd3db6f461fee8461651678e
parent878a57d7b2535fdb0a0838bd0b0c5894933a7986
Merge branch 'wmdrawer' into next
12 files changed:
src/appicon.c
src/defaults.c
src/dock.c
src/funcs.h
src/icon.c
src/icon.h
src/misc.c
src/screen.c
src/screen.h
src/startup.c
src/wconfig.h.in
src/workspace.c