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	-3/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Inserted some Buttons in GUI and TouchGUI and modified handling of commands ↵	Fabian Schillinger	2010-07-10	1	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|	in pvs.cpp for later remote Command/Process enhancement
\| *	Revoke Fabians changes.	Johann Latocha	2010-07-10	1	-16/+3
\| \|
\| *	first commit to test git	Fabian Schillinger	2010-07-09	1	-3/+16
\| \|
* \|	Implement Network-wide Configuration Interface for Multicast File Transfer	Sebastien Braun	2010-10-05	1	-0/+15
\|/
*	initial import of latest svn version	Sebastian	2010-05-12	1	-0/+540