Skip to content
Commit de754f45 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

Merge branch 'upstream-3.0.x' into dfsg-upstream-3.0.x

Conflicts:
	mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
	mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
	mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
	mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
	mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
parents 4086d8b6 3ba12f04
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment