mirror of
https://github.com/lubosz/overte.git
synced 2025-04-24 18:23:22 +02:00
resolve conflicts on merge with upstream master
This commit is contained in:
parent
5ce9b27789
commit
812f877984
1 changed files with 0 additions and 1 deletions
|
@ -78,7 +78,6 @@ void attachNewBufferToAgent(Agent *newAgent) {
|
|||
}
|
||||
|
||||
int main(int argc, const char* argv[]) {
|
||||
signal(SIGSEGV, printStacktrace);
|
||||
setvbuf(stdout, NULL, _IOLBF, 0);
|
||||
|
||||
AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT);
|
||||
|
|
Loading…
Reference in a new issue