| commit | 92138f7263c6dddc4fed568ea3c492f638d9722d | [log] [tgz] |
|---|---|---|
| author | Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de> | Wed Oct 24 17:39:15 2012 +0200 |
| committer | Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de> | Wed Oct 24 17:39:15 2012 +0200 |
| tree | 84a413e05e02527657bb7c59d9c9d9984ca59472 | |
| parent | 99e0c3da567e527957e95361e7cf05f858aeafbc [diff] | |
| parent | 75e169d2bc69328428723c81c895384416d0552e [diff] |
Merge branch 'master' into 326228 Conflicts: providers/bundles/org.eclipse.ecf.provider.jmdns/.settings/org.eclipse.jdt.core.prefs providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java releng/features/org.eclipse.ecf.discovery.jmdns.feature/feature.xml releng/org.eclipse.ecf.releng.bm/ecf.rmap