Merge branch 'master' into osgi

Browse source

Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala

...

This commit is contained in:

Heiko Seeberger 2010-07-20 11:26:34 +02:00

parent 17ab34b68e db6c02896a

commit f3511df9a5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available