projects / oweals / cde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ee3d1 a7ec1c6)
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)
Resync one last time with master for 2.3 release tomorrow.

1  2 
cde/programs/dtwm/WmResource.c patch | diff1 | diff2 | blob | history

diff --cc cde/programs/dtwm/WmResource.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.