pvs.git - Pool Video Switch

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'openslx/master' into mcastft	Sebastien Braun	2010-10-05	1	-2/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt pvsmgr.qrc src/gui/clientConfigDialog.cpp src/gui/mainWindow.cpp src/gui/ui/mainwindow.ui src/gui/ui/mainwindowtouch.ui src/pvs.cpp src/pvs.h src/pvsDaemon.cpp src/pvsgui.cpp
\| *	Enhancement #587	Johann Latocha	2010-08-28	1	-2/+0
\| \|
* \|	Implement UI and pvsDaemon components for outgoing Multicast Transfer	Sebastien Braun	2010-07-17	1	-19/+182
\|/
*	initial import of latest svn version	Sebastian	2010-05-12	1	-0/+248