[banshee/grid: 12/12] Merge branch 'master' into grid



commit ed93d11e13f15cd9dae09f8015fd2b61c71c3e34
Merge: f8dac0a 0d7e85f
Author: Aaron Bockover <abockover novell com>
Date:   Thu Jan 21 19:02:29 2010 -0500

    Merge branch 'master' into grid

 Makefile.am                                        |   18 +-
 NEWS                                               |   62 +-
 build/build.environment.mk                         |    5 +-
 build/bundle/bockbuild/profile.py                  |    1 +
 build/pkg-config/banshee-1-lastfm.pc.in            |    2 +-
 configure.ac                                       |    2 -
 .../Banshee.Osx/Banshee.OsxBackend/OsxService.cs   |    5 +-
 src/Core/Banshee.Services/Banshee.Services.csproj  |    1 -
 .../Banshee.Gui/BaseClientWindow.cs                |    6 +-
 .../Banshee.Lastfm/Banshee.Lastfm.csproj           |    1 -
 src/Extensions/Banshee.Lastfm/Makefile.am          |    2 +-
 .../Banshee.Podcasting/Banshee.Podcasting.csproj   |    1 -
 src/Libraries/Hyena/Hyena.csproj                   |    2 +
 src/Libraries/Hyena/Makefile.am                    |    4 +-
 src/Libraries/Hyena/System.Web/Helpers.cs          |   38 +
 src/Libraries/Hyena/System.Web/HttpUtility.cs      | 1136 ++++++++++++++++++++
 src/Libraries/Lastfm/Lastfm.csproj                 |    1 -
 src/Libraries/Migo/Makefile.am                     |    4 -
 src/Libraries/Migo/Migo.csproj                     |    1 -
 19 files changed, 1263 insertions(+), 29 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]