weyne/MissionScriptingTools
1
0
Fork 0
mirror of https://github.com/mrSkortch/MissionScriptingTools.git synced 2025-08-15 10:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	.gitattributes
This commit is contained in:
mrSkortch 2014-08-01 23:04:28 -06:00
commit 5c6319c064
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -22,7 +22,8 @@
*.RTF diff=astextplain *.RTF diff=astextplain
*.txt eol=crlf *.txt eol=crlf
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore
README.md export-ignore README.md export-ignore
mist_doc_file.doc export-ignore mist_doc_file.doc export-ignore