From d47008b3b3c7fefeac16927292aac03d247f5e71 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Wed, 20 May 2015 08:23:55 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83?= =?UTF-8?q?=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=B2=20=D1=81=D1=85=D1=80?= =?UTF-8?q?=D0=BE=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62650 954022d7-b5bf-4e40-9824-e11837661b57 --- .gitattributes | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index e781088168..15b78f33f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8861,6 +8861,7 @@ _tags/rev_61879/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.pdb svn _tags/rev_61879/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/Interop.ASCDocFile.dll svn_mime_002dtype=application%2Foctet-stream _tags/rev_61879/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/TestFile.docx svn_mime_002dtype=application%2Foctet-stream _tags/rev_61879/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/test.doc svn_mime_002dtype=application%2Foctet-stream +_tags/rev_61879/ASCOfficeOdtFile/Resource/OdtTemplate.odt svn_mime_002dtype=application%2Foctet-stream _tags/rev_61879/ASCOfficePDFReader/FreeType/freetype231.lib svn_mime_002dtype=application%2Foctet-stream _tags/rev_61879/ASCOfficePDFReader/FreeType/freetype2312_vs2005.lib svn_mime_002dtype=application%2Foctet-stream _tags/rev_61879/ASCOfficePDFReader/FreeType/freetype2312_vs2005_Debug.lib svn_mime_002dtype=application%2Foctet-stream diff --git a/.gitignore b/.gitignore index cf4524fb97..eaa04fc33c 100644 --- a/.gitignore +++ b/.gitignore @@ -162,6 +162,7 @@ _tags/rev_61879/ASCOfficeOdpFile/ODPFormat/ReadMe.txt _tags/rev_61879/ASCOfficeOdpFile/ODPFormat/Release _tags/rev_61879/ASCOfficeOdpFile/Odp2DrawingXML/Debug _tags/rev_61879/ASCOfficeOdpFile/Odp2DrawingXML/Release +_tags/rev_61879/ASCOfficeOdtFile/Projects/* _tags/rev_61879/ASCOfficePPTXFile/*.suo _tags/rev_61879/ASCOfficePPTXFile/Debug _tags/rev_61879/ASCOfficePPTXFile/PPTXFormat/!_