From 512176cbd4595552df04eaeb2d406b81b6588969 Mon Sep 17 00:00:00 2001 From: "Ivan.Shulga" Date: Fri, 22 Nov 2013 11:45:00 +0000 Subject: [PATCH] git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52411 954022d7-b5bf-4e40-9824-e11837661b57 --- .gitattributes | 2 +- .../ASCImageCompose.bmp | Bin .../ASCImageCompose.cpp | 0 .../ASCImageCompose.rc | 0 .../ASCImageCompose.rgs | 0 .../ASCImageCompose.sln | 0 .../ASCImageCompose.vcproj | 0 .../ImageCompose.cpp | 0 .../ImageCompose.h | 0 .../ImageComposeIPP.cpp | 0 .../ImageComposeIPP.h | 0 .../Patterns.h | 0 .../Resource.h | 0 .../SmartImage.h | 0 .../stdafx.cpp | 0 .../stdafx.h | 0 .../version.h | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.bmp (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.cpp (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.rc (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.rgs (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.sln (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ASCImageCompose.vcproj (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ImageCompose.cpp (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ImageCompose.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ImageComposeIPP.cpp (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/ImageComposeIPP.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/Patterns.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/Resource.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/SmartImage.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/stdafx.cpp (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/stdafx.h (100%) rename ASCImageStudio3/{ASC_ImageCompose3 => ASCImageCompose3}/version.h (100%) diff --git a/.gitattributes b/.gitattributes index 79e0fd81a8..010d242c64 100644 --- 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/ASC_ImageCompose3/ASCImageCompose.bmp svn_mime_002dtype=application%2Foctet-stream +ASCImageStudio3/ASCImageCompose3/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 diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.bmp b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.bmp similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.bmp rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.bmp diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.cpp b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.cpp similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.cpp rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.cpp diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.rc b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.rc similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.rc rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.rc diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.rgs b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.rgs similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.rgs rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.rgs diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.sln b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.sln similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.sln rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.sln diff --git a/ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.vcproj b/ASCImageStudio3/ASCImageCompose3/ASCImageCompose.vcproj similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ASCImageCompose.vcproj rename to ASCImageStudio3/ASCImageCompose3/ASCImageCompose.vcproj diff --git a/ASCImageStudio3/ASC_ImageCompose3/ImageCompose.cpp b/ASCImageStudio3/ASCImageCompose3/ImageCompose.cpp similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ImageCompose.cpp rename to ASCImageStudio3/ASCImageCompose3/ImageCompose.cpp diff --git a/ASCImageStudio3/ASC_ImageCompose3/ImageCompose.h b/ASCImageStudio3/ASCImageCompose3/ImageCompose.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ImageCompose.h rename to ASCImageStudio3/ASCImageCompose3/ImageCompose.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/ImageComposeIPP.cpp b/ASCImageStudio3/ASCImageCompose3/ImageComposeIPP.cpp similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ImageComposeIPP.cpp rename to ASCImageStudio3/ASCImageCompose3/ImageComposeIPP.cpp diff --git a/ASCImageStudio3/ASC_ImageCompose3/ImageComposeIPP.h b/ASCImageStudio3/ASCImageCompose3/ImageComposeIPP.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/ImageComposeIPP.h rename to ASCImageStudio3/ASCImageCompose3/ImageComposeIPP.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/Patterns.h b/ASCImageStudio3/ASCImageCompose3/Patterns.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/Patterns.h rename to ASCImageStudio3/ASCImageCompose3/Patterns.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/Resource.h b/ASCImageStudio3/ASCImageCompose3/Resource.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/Resource.h rename to ASCImageStudio3/ASCImageCompose3/Resource.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/SmartImage.h b/ASCImageStudio3/ASCImageCompose3/SmartImage.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/SmartImage.h rename to ASCImageStudio3/ASCImageCompose3/SmartImage.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/stdafx.cpp b/ASCImageStudio3/ASCImageCompose3/stdafx.cpp similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/stdafx.cpp rename to ASCImageStudio3/ASCImageCompose3/stdafx.cpp diff --git a/ASCImageStudio3/ASC_ImageCompose3/stdafx.h b/ASCImageStudio3/ASCImageCompose3/stdafx.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/stdafx.h rename to ASCImageStudio3/ASCImageCompose3/stdafx.h diff --git a/ASCImageStudio3/ASC_ImageCompose3/version.h b/ASCImageStudio3/ASCImageCompose3/version.h similarity index 100% rename from ASCImageStudio3/ASC_ImageCompose3/version.h rename to ASCImageStudio3/ASCImageCompose3/version.h