Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/18d0738c Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/18d0738c Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/18d0738c Branch: refs/heads/develop Commit: 18d0738c42f642fe3bef12d5e424d1aea1407260 Parents: f8d36d1 2783266 Author: Mihai Chira <mih...@apache.org> Authored: Mon Mar 30 15:45:38 2015 +0200 Committer: Mihai Chira <mih...@apache.org> Committed: Mon Mar 30 15:45:38 2015 +0200 ---------------------------------------------------------------------- .../base/src/main/resources/templates/default.vm | 16 ++++++++++++++++ .../base/src/main/resources/templates/pom.vm | 16 ++++++++++++++++ .../base/src/main/resources/velocity.properties | 19 +++++++++++++++++++ 3 files changed, 51 insertions(+) ----------------------------------------------------------------------
