| commit | 8ae5c50a1d1b961c9c80fd5d761a17616dbeebb3 | [log] [tgz] |
|---|---|---|
| author | Hristo Iliev <hsiliev@gmail.com> | Sat Mar 12 08:30:08 2011 +0200 |
| committer | Hristo Iliev <hsiliev@gmail.com> | Sat Mar 12 08:30:08 2011 +0200 |
| tree | 21312c0f62c433aabf613b52f7fef3abd6574ff3 | |
| parent | 1b3920702923fadd4990ddd63543a5391e0b5a0d [diff] | |
| parent | 8f662da298766ba663140514fcd177af1c2098a5 [diff] |
Merge branch 'master' into bug324991-eclipse-structure Conflicts: build-kernel/bin/dmk.bat build-kernel/build.xml build-kernel/lib/org.eclipse.virgo.kernel.launch.properties build.versions org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java