You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

scmerger a060a4d6cc Merge branch '1.0-local' into trunk-local ... * 1.0-local: - Make the local video disabled by default.		17 years ago
..
gui	Merge branch '1.0-local' into trunk-local	17 years ago
media	Implements a ConfigurationForm which allows configuring the MediaService.	17 years ago
systray	Changing of Dock Icon according to global status and changing systray changing to avoid errors if icons are missing.	18 years ago