aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-12-21fix merge conflictLuke Pulverenti
2015-12-21fix 64-bit windows buildLuke Pulverenti
2015-12-20Merge pull request #1345 from MediaBrowser/masterLuke
2015-12-20Merge pull request #1344 from MediaBrowser/masterLuke
2015-12-20Merge pull request #1343 from MediaBrowser/masterLuke
2015-12-19Merge branch 'dev' of https://github.com/MediaBrowser/Emby into devLuke Pulverenti
2015-12-19Merge pull request #1342 from MediaBrowser/masterLuke
2015-12-19restore changesLuke Pulverenti
2015-12-19Merge pull request #1341 from MediaBrowser/masterLuke
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19update themeLuke Pulverenti
2015-12-19Merge pull request #1340 from MediaBrowser/masterLuke
2015-12-19Merge pull request #1339 from MediaBrowser/masterLuke
2015-12-19fix file deletionLuke Pulverenti
2015-12-19update interlaced detectionLuke Pulverenti
2015-12-19update interlaced detectionLuke Pulverenti
2015-12-19Merge pull request #1338 from MediaBrowser/masterLuke
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19sync media encoderLuke Pulverenti
2015-12-19Merge pull request #1337 from MediaBrowser/mediainfoLuke
2015-12-19update interlaced detection formatsLuke Pulverenti
2015-12-19adjust loggingLuke Pulverenti
2015-12-19restore changesLuke Pulverenti
2015-12-19Merge pull request #1336 from MediaBrowser/mediainfoLuke
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19detect interlacedLuke Pulverenti
2015-12-19remove call from probe result normalizerLuke Pulverenti
2015-12-19Merge pull request #1335 from MediaBrowser/mediainfoLuke
2015-12-19update solution filesLuke Pulverenti
2015-12-19Merge pull request #1334 from MediaBrowser/mediainfoLuke
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19fix merge conflictLuke Pulverenti
2015-12-19remove MediaInfoLuke Pulverenti
2015-12-18Merge pull request #1333 from MediaBrowser/masterLuke
2015-12-18update translationsLuke Pulverenti
2015-12-18Merge pull request #1332 from MediaBrowser/masterLuke
2015-12-18Merge pull request #1331 from MediaBrowser/masterLuke
2015-12-18Merge pull request #1330 from MediaBrowser/masterLuke
2015-12-18update componentsLuke Pulverenti
2015-12-18Merge pull request #1329 from MediaBrowser/masterLuke
2015-12-18fix merge conflictLuke Pulverenti
2015-12-18Merge pull request #1328 from MediaBrowser/masterLuke
2015-12-183.0.5781.7Luke Pulverenti
2015-12-18fix tvdb lookup by imdb idLuke Pulverenti
2015-12-17Merge pull request #1326 from MediaBrowser/masterLuke
2015-12-16revert roku changeLuke Pulverenti
2015-12-16update componentsLuke Pulverenti
2015-12-16Merge branch 'dev' of https://github.com/MediaBrowser/Emby into devLuke Pulverenti