* text=auto # Sources *.c text diff=cpp *.cc text diff=cpp *.cxx text diff=cpp *.cpp text diff=cpp *.cpi text diff=cpp *.c++ text diff=cpp *.hpp text diff=cpp *.h text diff=cpp *.h++ text diff=cpp *.hh text diff=cpp # Compiled Object files *.slo binary *.lo binary *.o binary *.obj binary # Precompiled Headers *.gch binary *.pch binary # Compiled Dynamic libraries *.so binary *.dylib binary *.dll binary # Compiled Static libraries *.lai binary *.la binary *.a binary *.lib binary # Executables *.exe binary *.out binary *.app binary ############################################################################### # Set the merge driver for project and solution files # # Merging from the command prompt will add diff markers to the files if there # are conflicts (Merging from VS is not affected by the settings below, in VS # the diff markers are never inserted). Diff markers may cause the following # file extensions to fail to load in VS. An alternative would be to treat # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just comment the entries below and # uncomment the group further below ############################################################################### *.sln text eol=crlf *.csproj text eol=crlf *.vbproj text eol=crlf *.vcxproj text eol=crlf *.vcproj text eol=crlf *.dbproj text eol=crlf *.fsproj text eol=crlf *.lsproj text eol=crlf *.wixproj text eol=crlf *.modelproj text eol=crlf *.sqlproj text eol=crlf *.wwaproj text eol=crlf *.xproj text eol=crlf *.props text eol=crlf *.filters text eol=crlf *.vcxitems text eol=crlf #*.sln merge=binary #*.csproj merge=binary #*.vbproj merge=binary #*.vcxproj merge=binary #*.vcproj merge=binary #*.dbproj merge=binary #*.fsproj merge=binary #*.lsproj merge=binary #*.wixproj merge=binary #*.modelproj merge=binary #*.sqlproj merge=binary #*.wwaproj merge=binary #*.xproj merge=binary #*.props merge=binary #*.filters merge=binary #*.vcxitems merge=binary