Joerg Mueller 43ab8e8624 * Merge trunk up to r39790. ...

* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.

2011-08-30 08:22:03 +00:00

..

modules

* Merge trunk up to r39790.

2011-08-30 08:22:03 +00:00

presets

* Merging trunk up to r38981.

2011-08-03 12:44:52 +00:00

startup

* Merge trunk up to r39790.

2011-08-30 08:22:03 +00:00

templates

pep8 edits and change '!= None' to 'is not None'

2011-08-22 09:01:49 +00:00