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 5838cdc65014d73e2c0915302665467e257917cb Merge: 1582b23 95a940e Author: Paul King <[email protected]> AuthorDate: Wed May 15 17:33:00 2019 +1000 Split history main/resources/groovy/ui to main/resources/groovy/console - resolve conflict and keep both files .../src/main/groovy/groovy/console/ui/package.html | 4 +- .../groovy/groovy/console/ui/swingui/package.html | 28 --------- .../resources/groovy/console/ui/Console.properties | 47 +++++++++++++++ .../resources/groovy/console/ui/ConsoleIcon.png | Bin 0 -> 3739 bytes .../groovy/console/ui/InteractiveShell.properties | 66 +++++++++++++++++++++ .../groovy/console/ui/icons/arrow_redo.png | Bin 0 -> 625 bytes .../groovy/console/ui/icons/arrow_undo.png | Bin 0 -> 631 bytes .../groovy/console/ui/icons/book_next.png | Bin 0 -> 702 bytes .../groovy/console/ui/icons/book_previous.png | Bin 0 -> 680 bytes .../groovy/console/ui/icons/bullet_green.png | Bin 0 -> 295 bytes .../resources/groovy/console/ui/icons/clear.png | Bin 0 -> 524 bytes .../groovy/console/ui/icons/credits.txt} | 25 ++------ .../resources/groovy/console/ui/icons/cross.png | Bin 0 -> 655 bytes .../main/resources/groovy/console/ui/icons/cut.png | Bin 0 -> 648 bytes .../resources/groovy/console/ui/icons/cut_red.png | Bin 0 -> 650 bytes .../resources/groovy/console/ui/icons/disk.png | Bin 0 -> 620 bytes .../resources/groovy/console/ui/icons/find.png | Bin 0 -> 659 bytes .../groovy/console/ui/icons/folder_page.png | Bin 0 -> 688 bytes .../resources/groovy/console/ui/icons/page.png | Bin 0 -> 635 bytes .../groovy/console/ui/icons/page_copy.png | Bin 0 -> 663 bytes .../groovy/console/ui/icons/page_paste.png | Bin 0 -> 703 bytes .../groovy/console/ui/icons/script_go.png | Bin 0 -> 839 bytes .../groovy/console/ui/icons/text_replace.png | Bin 0 -> 691 bytes 23 files changed, 119 insertions(+), 51 deletions(-)
