Merge branch 'NIFI-240' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/67362a99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67362a99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67362a99 Branch: refs/heads/develop Commit: 67362a99084d7c50304d43df846c840ab965923d Parents: aaa2992 a76e91b Author: joewitt <joew...@apache.org> Authored: Sun Jan 11 21:40:43 2015 -0500 Committer: joewitt <joew...@apache.org> Committed: Sun Jan 11 21:40:43 2015 -0500 ---------------------------------------------------------------------- .../src/main/webapp/images/bg-error.png | Bin 90275 -> 63766 bytes .../src/main/webapp/images/bgNifiLogo.png | Bin 1682 -> 4232 bytes .../src/main/webapp/images/loadAnimation.gif | Bin 7854 -> 10789 bytes .../src/main/webapp/images/nifi16.ico | Bin 1150 -> 1150 bytes .../src/main/webapp/images/nifi_about.png | Bin 18958 -> 16323 bytes 5 files changed, 0 insertions(+), 0 deletions(-) ----------------------------------------------------------------------