Merge branch 'updated-site-2.0.2'
Conflicts:
log4j-bom/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ab3a64e2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ab3a64e2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ab3a64e2
Branch: refs/heads/master
Commit: ab3a64e235f15f3d6680214bb0401c5f52e4a41b
Parents: 4439186 feb2cc4
Author: Matt Sicker <[email protected]>
Authored: Fri Aug 29 21:31:30 2014 -0500
Committer: Matt Sicker <[email protected]>
Committed: Fri Aug 29 21:31:30 2014 -0500
----------------------------------------------------------------------
pom.xml | 14 +++++++-------
src/site/apt/download.apt.vm | 5 +++--
src/site/xdoc/javadoc.xml | 8 ++++++++
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab3a64e2/pom.xml
----------------------------------------------------------------------
