Luke Pulverenti 5963affec5 fix merge conflict

2015-12-19 10:56:07 -05:00

..

BdInfo

create separate media encoding project

2014-03-27 15:30:21 -04:00

Configuration

continue file system rework

2015-10-04 00:23:11 -04:00

Encoder

update keyframe setting

2015-12-12 01:49:03 -05:00

Probing

fix merge conflict

2015-12-19 10:56:07 -05:00

Properties

update mono build

2014-07-09 10:39:04 -04:00

Subtitles

rework people

2015-10-04 23:24:24 -04:00

MediaBrowser.MediaEncoding.csproj

fix merge conflict

2015-12-19 10:56:07 -05:00

packages.config

update commonio

2015-10-05 21:27:49 -04:00