← Back to branch summary

~jstys-z/helioviewer.org/client5

~jstys-z/helioviewer.org/client5

« back to all changes in this revision

Viewing changes to api/resources/FFmpeg/libx264-hq.ffpreset

Committer: Keith Hughitt
Date: 2012-08-10 18:15:41 UTC
mfrom: (402.4.61 hv)
Revision ID: keith.hughitt@nasa.gov-20120810181541-4zkdf7td1igj55lw

Merged in development changes

files added:
resources/images/iPhone/sdo_cutout.png

resources/images/iPhone/sdo_cutout.xcf

resources/images/iPhone/ssw_idl.png

resources/images/iPhone/ssw_idl_32x32.png

files removed:
resources/images/iPhone/iPhone_CUT.png

resources/images/iPhone/iPhone_CUT.xcf

files renamed:
resources/images/iPhone/iPhone_CUT_32x32.png => resources/images/iPhone/sdo_cutout_32x32.png

files modified:
api/index.php

api/src/Module/WebClient.php

src/js/Media/MovieManagerUI.js

Show diffs side-by-side

added added

removed removed

api/resources/FFmpeg/libx264-hq.ffpreset

Older »