############################################################################### # Set default behavior to automatically normalize line endings. ############################################################################### main/source/**/* text=auto ############################################################################### # 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 ############################################################################### main/source/**/*.sln text eol=crlf main/source/**/*.csproj text eol=crlf main/source/**/*.vbproj text eol=crlf main/source/**/*.vcxproj text eol=crlf main/source/**/*.vcproj text eol=crlf main/source/**/*.dbproj text eol=crlf main/source/**/*.fsproj text eol=crlf main/source/**/*.lsproj text eol=crlf main/source/**/*.wixproj text eol=crlf main/source/**/*.modelproj text eol=crlf main/source/**/*.sqlproj text eol=crlf main/source/**/*.wmaproj text eol=crlf main/source/**/*.xproj text eol=crlf main/source/**/*.props text eol=crlf main/source/**/*.filters text eol=crlf main/source/**/*.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 # C++ Stuff # sources main/source/**/*.c text main/source/**/*.cc text main/source/**/*.cxx text main/source/**/*.cpp text main/source/**/*.c++ text main/source/**/*.hpp text main/source/**/*.h text main/source/**/*.h++ text main/source/**/*.hh text # 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