This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 4e42d8468482d53c50703ddc8aac2762131e63a0
Merge: 198c97c f383342
Author: Paul King <[email protected]>
AuthorDate: Wed May 15 14:37:26 2019 +1000

    Split history main/groovy/groovy/inspect/swingui/ to 
main/groovy/groovy/console/ - resolve conflict and keep both files

 .../groovy/console/swingui/AstBrowser.groovy       |  681 +++++++++++
 .../console/swingui/AstNodeToScriptAdapter.groovy  | 1183 ++++++++++++++++++++
 .../console/swingui/ButtonOrDefaultRenderer.groovy |   42 +
 .../console/swingui/ButtonOrTextEditor.groovy      |   61 +
 .../groovy/console/swingui/ObjectBrowser.groovy    |  167 +++
 .../console/swingui/ScriptToTreeNodeAdapter.groovy |  820 ++++++++++++++
 .../groovy/groovy/console/swingui/package.html     |   28 +
 7 files changed, 2982 insertions(+)

Reply via email to