Google Git
Sign in
eclipse / jetty / org.eclipse.jetty.project / 7523c5234ca9d4a6faa03df23458f7f2f80ce07c
commit7523c5234ca9d4a6faa03df23458f7f2f80ce07c[log] [tgz]
authorJan Bartel <janb@intalio.com>Thu Apr 04 13:31:33 2013 +1100
committerJan Bartel <janb@intalio.com>Thu Apr 04 13:31:33 2013 +1100
treee36ba68eac9f0fdd7bdcadfc748104b242315e7e
parent279dff381c170721addfb1783c298e8b0c20ace6 [diff]
parent2bd6a703f91202b4cb223defcd4e71d3e34403f7 [diff]
Merge remote-tracking branch 'origin/master' into servlet-3.1-api

Conflicts:
	jetty-jsp/pom.xml
tree: e36ba68eac9f0fdd7bdcadfc748104b242315e7e
  1. aggregates/
  2. dists/
  3. examples/
  4. jetty-annotations/
  5. jetty-ant/
  6. jetty-client/
  7. jetty-continuation/
  8. jetty-deploy/
  9. jetty-distribution/
  10. jetty-http/
  11. jetty-http-spi/
  12. jetty-io/
  13. jetty-jaas/
  14. jetty-jaspi/
  15. jetty-jmx/
  16. jetty-jndi/
  17. jetty-jsp/
  18. jetty-jspc-maven-plugin/
  19. jetty-maven-plugin/
  20. jetty-monitor/
  21. jetty-nosql/
  22. jetty-npn/
  23. jetty-osgi/
  24. jetty-plus/
  25. jetty-proxy/
  26. jetty-rewrite/
  27. jetty-rhttp/
  28. jetty-runner/
  29. jetty-security/
  30. jetty-server/
  31. jetty-servlet/
  32. jetty-servlets/
  33. jetty-spdy/
  34. jetty-spring/
  35. jetty-start/
  36. jetty-util/
  37. jetty-util-ajax/
  38. jetty-webapp/
  39. jetty-websocket/
  40. jetty-xml/
  41. LICENSE-CONTRIBUTOR/
  42. tests/
  43. .gitignore
  44. .travis.yml
  45. header-template.txt
  46. icon.jpg
  47. LICENSE-eplv10-aslv20.html
  48. NOTICE.txt
  49. pom.xml
  50. README.txt
  51. settings.xml
  52. VERSION.txt