After dealing with a couple nasty merge conflicts across branches, I realized
we had some files with line endings not right. So, I've added a .gitattributes
file to wix39 and wix40 branches and forced an update of all the files.
Please update your working branches with the latest from one of these branches
before sending another pull request. That will make life much easier going
forward. Thanks.
virtually,
Rob
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
