Merge branch 'cde-next' of ssh://git.code.sf.net/p/cdesktopenv/code into cde-next
authorPeter Howkins <flibble@users.sf.net>
Fri, 29 Jun 2018 18:30:04 +0000 (19:30 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 29 Jun 2018 18:30:04 +0000 (19:30 +0100)
commit780ec11b8a20b77e804993c7f419d51106beb367
tree3f6261b9c7014a428ff730ee487dc836d78aee9a
parent1294f15d16b4b1506392cf602e83e54fe48986c2
parenta4a5413cd5ad322578bd9efd70f173fc347ee62b
Merge branch 'cde-next' of ssh://git.code.sf.net/p/cdesktopenv/code into cde-next