On Sun, 6 Oct 2013, Phil Dibowitz wrote: >> Convert to use MinGW as the primary build system. Remove all Visual C++ >> project files and associated special Windows code. Convert Windows to use >> HIDAPI and remove WinHID code. Fixed many warnings exposed by the MinGW >> build. >> Add an NSIS installer creation script. > > Are you rebased? This didn't apply for me: > > [phil@rider (master) concordance]$ git am -s ~/mail/concordance_to_apply > Applying: Major cleanup for Concordance Windows build. > error: patch failed: concordance/win/concordance.vcxproj:1 > error: concordance/win/concordance.vcxproj: patch does not apply > error: patch failed: consnoop/win/consnoop.vcxproj:1 > error: consnoop/win/consnoop.vcxproj: patch does not apply > error: patch failed: libconcord/win/libconcord_libusb.vcxproj:1 > error: libconcord/win/libconcord_libusb.vcxproj: patch does not apply > error: patch failed: libconcord/win/libconcord_winhid.vcxproj:1 > error: libconcord/win/libconcord_winhid.vcxproj: patch does not apply > error: patch failed: win/concordance.sln:1 > error: win/concordance.sln: patch does not apply
Sigh. No, not a rebase problem. I think the problem is that all of these files have a UTF Byte Order Mark at the beginning and I think git format-patch and git am aren't handling that properly. I'll send another patch without including those files, and can you just delete those five files in a separate commit? ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk _______________________________________________ concordance-devel mailing list concordance-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/concordance-devel