Merge branch 'master' into gsoc2010
authorAustin Burrow <atburrow@gmail.com>
Mon, 16 Aug 2010 05:19:33 +0000 (00:19 -0500)
committerAustin Burrow <atburrow@gmail.com>
Mon, 16 Aug 2010 05:19:33 +0000 (00:19 -0500)
Conflicts:
configure.ac

1  2 
configure.ac
modules/LIST

diff --cc configure.ac
@@@ -3694,11 -3694,10 +3697,10 @@@ dnl  JACK module
  dnl
  PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto])
  
  dnl
 -dnl UPnP Plugin (Intel SDK)
 +dnl  UPnP DLNA Plugins
  dnl
 -PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
 +PKG_ENABLE_MODULES_VLC([UPNP], [upnp upnp_intel], [libupnp libdlna], [Intel UPnp SDK],[auto])
  
  dnl
  dnl  Interface plugins
diff --cc modules/LIST
Simple merge