resolve conflicts on merge with upstream master

This commit is contained in:
Stephen Birarda 2013-05-09 12:37:39 -07:00
parent 5ce9b27789
commit 812f877984

View file

@ -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);