Merge branch 'master' into update-with-master
authorJon Trulson <jon@radscan.com>
Thu, 5 Jul 2018 20:18:07 +0000 (14:18 -0600)
committerJon Trulson <jon@radscan.com>
Thu, 5 Jul 2018 20:18:07 +0000 (14:18 -0600)
commit87ad4219da44c5a835dadae074d47c28d49b098e
tree0d3fa40669e2a5cfc471b261beab5552717a7fdb
parent16ee3d1be574129b84d3b14a3be873324ee6e106
parenta7ec1c618234c9466d3b280e8174669121fb5c40
Merge branch 'master' into update-with-master

Resync one last time with master for 2.3 release tomorrow.
cde/programs/dtwm/WmResource.c