Branch: refs/heads/routing_refactoring
  Home:   https://github.com/castleproject/MonoRail
  Commit: c0886c0f9a3269caf0de86a7cbbca46c0660a75a
      
https://github.com/castleproject/MonoRail/commit/c0886c0f9a3269caf0de86a7cbbca46c0660a75a
  Author: hconceicao <[email protected]>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M MR3/src/Castle.MonoRail.Generator/Castle.MonoRail.Generator.fsproj
  M MR3/src/Castle.MonoRail.Generator/Program.fs

  Log Message:
  -----------
  added explicit entry point


  Commit: 45448d46b6d63a1708f8344934b8ce76e44d4795
      
https://github.com/castleproject/MonoRail/commit/45448d46b6d63a1708f8344934b8ce76e44d4795
  Author: hconceicao <[email protected]>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M 
MR3/Extensions/OData/src/Castle.MonoRail.Extension.OData/Castle.MonoRail.Extension.OData.csproj
  M MR3/Extensions/OData/src/Castle.MonoRail.Extension.OData/SegmentParser.cs
  M 
MR3/Extensions/OData/tests/Castle.MonoRail.Extension.OData.Tests/Castle.MonoRail.Extension.OData.Tests.csproj
  M 
MR3/Extensions/OData/tests/Castle.MonoRail.Extension.OData.Tests/SegmentParserTestCase.cs

  Log Message:
  -----------
  Merge branch 'routing_refactoring' of github.com:castleproject/MonoRail into 
routing_refactoring

Conflicts:
        
MR3/Extensions/OData/tests/Castle.MonoRail.Extension.OData.Tests/Castle.MonoRail.Extension.OData.Tests.csproj
        
MR3/Extensions/OData/tests/Castle.MonoRail.Extension.OData.Tests/SegmentParserTestCase.cs


Compare: https://github.com/castleproject/MonoRail/compare/4e87861...45448d4

-- 
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