Thu, 13 Aug 2009 11:37:38 +0200Merge with 75ae46b66315975b49ec48574befa094be583fdd
edouard [Thu, 13 Aug 2009 11:37:38 +0200] rev 379
Merge with 75ae46b66315975b49ec48574befa094be583fdd

Wed, 12 Aug 2009 16:23:59 -0600merged greg's recent commits
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:23:59 -0600] rev 378
merged greg's recent commits

Wed, 12 Aug 2009 16:18:57 -0600remove code that i was using for testing.
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:18:57 -0600] rev 377
remove code that i was using for testing.

Wed, 12 Aug 2009 16:09:00 -0600merged in cherry-picked service discovery changes
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:09:00 -0600] rev 376
merged in cherry-picked service discovery changes

Wed, 12 Aug 2009 15:20:51 -0600fix discovery dialog sorting, remove services from the discovery dialog when they go offline cherry-pick
b.taylor@willowglen.ca [Wed, 12 Aug 2009 15:20:51 -0600] rev 375
fix discovery dialog sorting, remove services from the discovery dialog when they go offline

Wed, 12 Aug 2009 13:43:58 -0600bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered. cherry-pick
b.taylor@willowglen.ca [Wed, 12 Aug 2009 13:43:58 -0600] rev 374
bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.

Wed, 12 Aug 2009 13:40:20 -0600fix pyZeroconf bug where getServiceInfo returns None. cherry-pick
b.taylor@willowglen.ca [Wed, 12 Aug 2009 13:40:20 -0600] rev 373
fix pyZeroconf bug where getServiceInfo returns None.
This allows the discovery window to work with targets using Avahi to advertise their services.
(patch obtained from <http://sourceforge.net/tracker/?func=detail&aid=1600775&group_id=100909&atid=628622>)

Mon, 10 Aug 2009 11:35:14 +0200Added ShowMaster button icon for Canfestival plugin
edouard [Mon, 10 Aug 2009 11:35:14 +0200] rev 372
Added ShowMaster button icon for Canfestival plugin