Merge remote-tracking branch 'cgutman/master'

Browse Source

...

This commit is contained in:

Iwan Timmer

2014-12-30 00:56:13 +01:00

parent 20ae82e4b0 00fc94fc29

commit 52ff102aae

2 changed files with 45 additions and 95 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

libs/jcodec-0.1.5.jar Normal file

Binary file not shown.