summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorctrlaltca <>2013-02-08 16:49:58 +0000
committerctrlaltca <>2013-02-08 16:49:58 +0000
commit0f34cca749fade963acd014aff526067b00bc49e (patch)
tree91cd48dbcff32aad4cb75cbd4dee8017b1912375 /.gitattributes
parent6b390ff3a048b93e1a5feab758cdab7bfdc9b3d1 (diff)
merged to trunk/ all the changes from branch/3.2 up to r3270
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index d9f56505..a8cce7ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -803,6 +803,7 @@ buildscripts/chmbuilder/classes/pages/Classes.page -text
buildscripts/chmbuilder/classes/pages/MainLayout.tpl -text
buildscripts/chmbuilder/classes/pages/style.css -text
buildscripts/classtree/DWExtensionReadme.txt -text
+buildscripts/classtree/ExtensionReadme.html -text
buildscripts/jGrouseDoc/3rdparty/ant/LICENSE -text
buildscripts/jGrouseDoc/3rdparty/ant/LICENSE.dom -text
buildscripts/jGrouseDoc/3rdparty/ant/LICENSE.sax -text