Skip to content

Commit

Permalink
Merge master into HEAD
Browse files Browse the repository at this point in the history 
Conflicts:
	C-3PO.pl
	Transcoder.pm
	install.xml
  • Loading branch information
marco committed Jan 18, 2016
1 parent 1fc36f0 commit f0a600b
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 1,878 deletions.
6 changes: 3 additions & 3 deletions Plugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ sub _testC3POEXE{
return 0;
}

my $command= qq("$pathToC3PO_exe" -h hello -l "$logFolder");
my $command= qq("$pathToC3PO_exe" -h hello -l "$logFolder" -x "$serverFolder");

if (! (main::DEBUGLOG && $log->is_debug)) {

Expand Down Expand Up @@ -672,7 +672,7 @@ sub _testC3POPL{
return 0;
}

my $command= qq("$pathToPerl" "$pathToC3PO_pl" -h hello -l "$logFolder");
my $command= qq("$pathToPerl" "$pathToC3PO_pl" -h hello -l "$logFolder" -x "$serverFolder");

if (! main::DEBUGLOG || ! $log->is_debug) {

Expand Down Expand Up @@ -1532,4 +1532,4 @@ sub _getStatusLine{

return $tab;
}
1;
1;
339 changes: 0 additions & 339 deletions include/Audio/COPYING
View file

This file was deleted.

Loading

0 comments on commit f0a600b

Please sign in to comment.