Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jetty-9.1

This commit is contained in:
Jan Bartel 2013-06-21 14:52:38 +10:00
parent f9b4636cdb 8d7477218d
commit f59ef8cfce
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-spdy/pom.xml
View File

@ -101,6 +101,20 @@
<npn.version>1.1.5.v20130313</npn.version> <npn.version>1.1.5.v20130313</npn.version>
</properties> </properties>
</profile> </profile>
<profile>
<id>7u25</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_25</value>
</property>
</activation>
<properties>
<npn.version>1.1.5.v20130313</npn.version>
</properties>
</profile>
</profiles>
</profiles> </profiles>
<modules> <modules>