Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-05-28 21:05:09 -0400
committerJan Bartel2013-05-28 21:05:09 -0400
commit3d553e79a9504a3387e9060ae9dde01e1370b892 (patch)
tree145ffa5ced7de13cfd75d6b05cefc75708ee3a79 /jetty-server/src/main/config
parent6f0195e0de86efb8ec93c9ec39b409f3c83df2c2 (diff)
parent54b62eafcbb6e8bec638d1cb73a230b0f5b575ff (diff)
downloadorg.eclipse.jetty.project-3d553e79a9504a3387e9060ae9dde01e1370b892.tar.gz
org.eclipse.jetty.project-3d553e79a9504a3387e9060ae9dde01e1370b892.tar.xz
org.eclipse.jetty.project-3d553e79a9504a3387e9060ae9dde01e1370b892.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
Diffstat (limited to 'jetty-server/src/main/config')
0 files changed, 0 insertions, 0 deletions

Back to the top