Merge branch 'develop'

This commit is contained in:
Samuele Locatelli
2013-10-04 10:29:37 +02:00
2245 changed files with 211546 additions and 341 deletions
+18 -12
View File
@@ -6,19 +6,20 @@
#--------------------------------------------
# ETS-WS
# ETS-DIP
#--------------------------------------------
/ETS-WS/ETS-WS/TempUploads/*
!/ETS-WS/ETS-WS/TempUploads/empty/PlaceHolder.file
/ETS-WS/ETS-WS/ArchivioDocs/*
!/ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file
/ETS-WS/ETS-WS/ArchivioDocsRed/*
!/ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file
/ETS-WS/ETS-WS/obj/Debug
/ETS-WS/ETS-WS/obj/Release
/ETS-WS/ETS-WS/obj/WinLab
/ETS-WS/ETS-WS/obj/ETS/Package/PackageTmp
/ETS-WS/ETS-WS/logs/*.log
/ETS-DIP/ETS-WS/obj/Release/*
/ETS-DIP/ETS-DIP/TempUploads/*
!/ETS-DIP/ETS-DIP/TempUploads/empty/PlaceHolder.file
/ETS-DIP/ETS-DIP/ArchivioDocs/*
!/ETS-DIP/ETS-DIP/ArchivioDocs/PlaceHolder.file
/ETS-DIP/ETS-DIP/ArchivioDocsRed/*
!/ETS-DIP/ETS-DIP/ArchivioDocsRed/PlaceHolder.file
/ETS-DIP/ETS-DIP/obj/Debug
/ETS-DIP/ETS-DIP/obj/Release
/ETS-DIP/ETS-DIP/obj/WinLab
/ETS-DIP/ETS-DIP/obj/ETS/Package/PackageTmp
/ETS-DIP/ETS-DIP/logs/*.log
#--------------------------------------------
@@ -46,3 +47,8 @@
/PROJ-ETS/PROJ-ETS/obj/ETS/Package/PackageTmp/*
/PROJ-ETS/PROJ-ETS/obj/ETS/*.pdb
/PROJ-ETS/PROJ-ETS/logs/*.log
/ETS-DIP/ReleaseClienti/ETS-WS.zip
/ETS-DIP/ReleaseClienti/ETS-WS.deploy.cmd
/ETS-DIP/ReleaseClienti/ETS-WS.deploy-readme.txt
/ETS-DIP/ReleaseClienti/ETS-WS.SetParameters.xml
/ETS-DIP/ReleaseClienti/ETS-WS.SourceManifest.xml

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Some files were not shown because too many files have changed in this diff Show More