Merge remote-tracking branch 'remotes/parent/pr/260' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8c3c49a4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8c3c49a4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8c3c49a4 Branch: refs/heads/master Commit: 8c3c49a4db576234968dd5baee9e4ea167b1ed0e Parents: 14f1753 2945e1a Author: Nikita Timofeev <[email protected]> Authored: Tue Jan 23 15:59:51 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Tue Jan 23 15:59:51 2018 +0300 ---------------------------------------------------------------------- .../main/resources/assemblies/assembly-mac.xml | 26 ++++++++++---------- .../resources/assemblies/assembly-windows.xml | 2 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + pom.xml | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
