git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52410 954022d7-b5bf-4e40-9824-e11837661b57

git-svn-id:...
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52410 954022d7-b5bf-4e40-9824-e11837661b57
1b64c4ad · Ivan.Shulga · Alexander Trofimov · 7d45ff4e · 1b64c4ad · 1b64c4ad
Commit 1b64c4ad authored Nov 22, 2013 by Ivan.Shulga Committed by Alexander Trofimov May 20, 2016
17 changed files
--- a/.gitattributes
+++ b/.gitattributes
@@ -42,7 +42,7 @@ ASCImageStudio3/ASCGraphics/cximage/tiff/Debug/Tiff.lib svn_mime_002dtype=applic
 ASCImageStudio3/ASCGraphics/cximage/tiff/Release/Tiff.lib svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/ASCGraphics/cximage/zlib/Debug/zlib.lib svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/ASCGraphics/cximage/zlib/Release/zlib.lib svn_mime_002dtype=application%2Foctet-stream
-ASCImageStudio3/AVSImageCompose3/ASCImageCompose.bmp svn_mime_002dtype=application%2Foctet-stream
+ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.bmp svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/AVSImageEditor/AVSImageEditor/AVSImageEditor.bmp svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/AVSImageEditor/AVSImageEditor/Commands/Images/Cursors/closehand.cur svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/AVSImageEditor/AVSImageEditor/Commands/Images/Cursors/hand.cur svn_mime_002dtype=application%2Foctet-stream

--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.bmp
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.bmp
--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.cpp
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.cpp
--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rc
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rc
--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rgs
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rgs
--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.sln
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.sln
--- a/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.vcproj
+++ b/ASCImageStudio3/AVSImageCompose3/ASCImageCompose.vcproj
--- a/ASCImageStudio3/AVSImageCompose3/ImageCompose.cpp
+++ b/ASCImageStudio3/AVSImageCompose3/ImageCompose.cpp
--- a/ASCImageStudio3/AVSImageCompose3/ImageCompose.h
+++ b/ASCImageStudio3/AVSImageCompose3/ImageCompose.h
--- a/ASCImageStudio3/AVSImageCompose3/ImageComposeIPP.cpp
+++ b/ASCImageStudio3/AVSImageCompose3/ImageComposeIPP.cpp
--- a/ASCImageStudio3/AVSImageCompose3/ImageComposeIPP.h
+++ b/ASCImageStudio3/AVSImageCompose3/ImageComposeIPP.h
--- a/ASCImageStudio3/AVSImageCompose3/Patterns.h
+++ b/ASCImageStudio3/AVSImageCompose3/Patterns.h
--- a/ASCImageStudio3/AVSImageCompose3/Resource.h
+++ b/ASCImageStudio3/AVSImageCompose3/Resource.h
--- a/ASCImageStudio3/AVSImageCompose3/SmartImage.h
+++ b/ASCImageStudio3/AVSImageCompose3/SmartImage.h
--- a/ASCImageStudio3/AVSImageCompose3/stdafx.cpp
+++ b/ASCImageStudio3/AVSImageCompose3/stdafx.cpp
--- a/ASCImageStudio3/AVSImageCompose3/stdafx.h
+++ b/ASCImageStudio3/AVSImageCompose3/stdafx.h
--- a/ASCImageStudio3/AVSImageCompose3/version.h
+++ b/ASCImageStudio3/AVSImageCompose3/version.h