diff --git a/.gitattributes b/.gitattributes index 412eeda7..0b6acf18 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,13 +10,13 @@ *.dbproj merge=union # Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain +*.doc diff=astextplain +*.DOC diff=astextplain *.docx diff=astextplain *.DOCX diff=astextplain *.dot diff=astextplain *.DOT diff=astextplain *.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 035a7bb1..0b2bd207 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,10 @@ *.sql *.sqlite +# Temporary files # +##################3 +*~ + # OS generated files # ###################### .DS_Store diff --git a/docs/LOOT Readme.html b/docs/LOOT Readme.html index 6d6d54b2..483406c0 100644 --- a/docs/LOOT Readme.html +++ b/docs/LOOT Readme.html @@ -459,7 +459,7 @@ A copy of the license is included in the file named "GNU FDL v1.3.txt".Added: Command line parameter for selecting the game LOOT should run for.