Merge remote branch 'remotes/origin/modules-migration'

Browse source

- Move akka-sample-camel from akka-modules repo to akka repo
- Conflicts (manually resolved):
	akka-docs/modules/spring.rst (use existing)
	project/build/AkkaProject.scala (use existing)

...

This commit is contained in:

Martin Krasser 2011-07-04 13:31:05 +02:00

parent 7d6e42718d 76fb2e127a

commit 0d74504d88

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