Branch: refs/heads/2.5.x
Home:   http://github.com/castleproject/Castle.InversionOfControl

Commit: 1e135dae7abff19f97d4af7d4f4091797c8266b7
    
http://github.com/castleproject/Castle.InversionOfControl/commit/1e135dae7abff19f97d4af7d4f4091797c8266b7
Author: Krzysztof Kozmic <[email protected]>
Date:   2010-10-12 (Tue, 12 Oct 2010)

Changed paths:
  M BreakingChanges.txt
  M Changes.txt
  M src/Castle.Facilities.Synchronize.Tests/SynchronizeFacilityTestFixture.cs
  M src/Castle.Facilities.Synchronize/CreateOnUIThreadInspector.cs
  M src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj
  A 
src/Castle.Windsor.Tests/Facilities/TypedFactory/TypedFactoryDependenciesTestCase.cs
  M 
src/Castle.Windsor.Tests/Facilities/TypedFactory/TypedFactoryFacilityTake2TestCase.cs
  A src/Castle.Windsor.Tests/MicroKernel/NotImplementedDependencyResolver.cs
  M src/Castle.Windsor.Tests/MicroKernelTestCase.cs
  M src/Castle.Windsor.Tests/Proxy/ComponentProxyRegistrationTestCase.cs
  M src/Castle.Windsor/Castle.Windsor.csproj
  M src/Castle.Windsor/Facilities/Remoting/RemotingFacility.cs
  M 
src/Castle.Windsor/Facilities/TypedFactory/DefaultDelegateComponentSelector.cs
  M 
src/Castle.Windsor/Facilities/TypedFactory/DefaultTypedFactoryComponentSelector.cs
  R src/Castle.Windsor/Facilities/TypedFactory/DelegateFactory.cs
  R src/Castle.Windsor/Facilities/TypedFactory/DelegateInvocation.cs
  R src/Castle.Windsor/Facilities/TypedFactory/Dispose.cs
  R src/Castle.Windsor/Facilities/TypedFactory/Empty.cs
  M src/Castle.Windsor/Facilities/TypedFactory/FactoryEntry.cs
  R src/Castle.Windsor/Facilities/TypedFactory/FactoryInterceptor.cs
  R src/Castle.Windsor/Facilities/TypedFactory/IDelegateGenerator.cs
  R src/Castle.Windsor/Facilities/TypedFactory/ITypedFactoryMethod.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/DelegateFactory.cs
  M src/Castle.Windsor/Facilities/TypedFactory/Internal/DelegateProxyFactory.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/Dispose.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/Empty.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/FactoryInterceptor.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/ITypedFactoryMethod.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/Release.cs
  A src/Castle.Windsor/Facilities/TypedFactory/Internal/Resolve.cs
  A 
src/Castle.Windsor/Facilities/TypedFactory/Internal/TypedFactoryInterceptor.cs
  R src/Castle.Windsor/Facilities/TypedFactory/NoUniqueComponentException.cs
  R src/Castle.Windsor/Facilities/TypedFactory/Release.cs
  R src/Castle.Windsor/Facilities/TypedFactory/Resolve.cs
  M src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryComponent.cs
  M 
src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryComponentCollection.cs
  M src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryConfiguration.cs
  M src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryFacility.cs
  R src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryInterceptor.cs
  M 
src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryRegistrationExtensions.cs
  M src/Castle.Windsor/MicroKernel/ComponentReference.cs
  M src/Castle.Windsor/MicroKernel/DefaultKernel.cs
  M src/Castle.Windsor/MicroKernel/Facilities/AbstractFacility.cs
  M src/Castle.Windsor/MicroKernel/Handlers/ExtendedHandler.cs
  M src/Castle.Windsor/MicroKernel/IDependencyResolver.cs
  M src/Castle.Windsor/MicroKernel/IReference.cs
  M src/Castle.Windsor/MicroKernel/InstanceReference.cs
  M src/Castle.Windsor/MicroKernel/Proxy/ProxyOptions.cs
  M src/Castle.Windsor/MicroKernel/Proxy/ProxyUtil.cs
  A src/Castle.Windsor/MicroKernel/Registration/DependencyDescriptor.cs
  M src/Castle.Windsor/MicroKernel/Resolvers/DefaultDependencyResolver.cs

Log Message:
-----------
Merge branch '2.5.x'

Conflicts:
        src/Castle.Windsor/MicroKernel/Facilities/AbstractFacility.cs


-- 
You received this message because you are subscribed to the Google Groups 
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/castle-project-commits?hl=en.

Reply via email to