Clone
Eric Johnson <ejohnson@redhat.com>
committed
on 05 Dec 12
Merge remote-tracking branch 'jane/master' into merge
Conflicts:
plugins/org.fusesource.ide.help/META-INF/MANIFEST.MF
plugins/org.fusesour… Show more
Merge remote-tracking branch 'jane/master' into merge

Conflicts:

        plugins/org.fusesource.ide.help/META-INF/MANIFEST.MF

        plugins/org.fusesource.ide.help/RiderCompRef.html

        plugins/org.fusesource.ide.help/contexts.xml

        plugins/org.fusesource.ide.help/index.html

Show less

10.x + 227 more