Update of /var/cvs/videolan/vls/src/server Modified Files: input.cpp input.h manager.cpp Log Message: Corrected a few merge conflicts and typos. -- jpsaman -- This is the vls-devel mailing-list, see http://www.videolan.org/vls-devel/ To unsubscribe, please read http://www.videolan.org/lists.html If you are in trouble, please contact <postmaster at videolan.org>