Skip to content

Conversation

@nickkolok
Copy link

fschuett added 30 commits April 21, 2014 20:42
Conflicts:
	src/org/opensourcephysics/media/core/VideoClip.java
	src/org/opensourcephysics/resources/media/video_de.properties
	src/org/opensourcephysics/resources/tools/xuggle.properties
	src/org/opensourcephysics/tools/DiagnosticsForXuggle.java
	src/org/opensourcephysics/tools/FunctionEditor.java
	src/org/opensourcephysics/tools/LaunchPanel.java
Conflicts:
	src/org/opensourcephysics/media/core/VideoClip.java
	src/org/opensourcephysics/tools/Diagnostics.java
	src/org/opensourcephysics/tools/DiagnosticsForXuggle.java
	src/org/opensourcephysics/tools/ExtensionsManager.java
	src/org/opensourcephysics/tools/FunctionEditor.java
# Conflicts:
#	src/org/opensourcephysics/media/core/BaselineFilter.java
#	src/org/opensourcephysics/media/core/BrightnessFilter.java
#	src/org/opensourcephysics/media/core/DarkGhostFilter.java
#	src/org/opensourcephysics/media/core/DecimalField.java
#	src/org/opensourcephysics/media/core/DeinterlaceFilter.java
#	src/org/opensourcephysics/media/core/GhostFilter.java
#	src/org/opensourcephysics/media/core/GrayScaleFilter.java
#	src/org/opensourcephysics/media/core/MediaRes.java
#	src/org/opensourcephysics/media/core/NegativeFilter.java
#	src/org/opensourcephysics/media/core/NumberField.java
#	src/org/opensourcephysics/media/core/RadialDistortionFilter.java
#	src/org/opensourcephysics/media/core/ResizeFilter.java
#	src/org/opensourcephysics/media/core/ScientificField.java
#	src/org/opensourcephysics/media/core/SumFilter.java
#	src/org/opensourcephysics/media/core/VideoAdapter.java
#	src/org/opensourcephysics/resources/media/video.properties
#	src/org/opensourcephysics/resources/media/video_fr.properties
#	src/org/opensourcephysics/tools/FunctionEditor.java
BobHanson added a commit that referenced this pull request Jul 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant