[xiph-commits] r7122 - in trunk/oggdsf: build/oggcodecs

illiminable at dactyl.lonelymoon.com illiminable
Wed Jul 14 11:46:13 PDT 2004


sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLDecoder
src/lib/codecs/cmml/libCMMLTags
src/lib/codecs/cmml/libCMMLTagsDotNET
src/lib/helper/libiWrapper src/lib/player/libDSPlayDotNET
src/tools/DNPlay
Message-ID: <20040714184613.744C89AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Wed Jul 14 11:46:13 2004
New Revision: 7122

Added:
trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.cpp
trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.h
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AssemblyInfo.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj
trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj
trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/IDNCMMLCallbacks.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.cpp
trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj
trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user
trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs
trunk/oggdsf/src/tools/DNPlay/frmDNPlay.resx
Log:
* Fixed a lot of bugs in the cmml libraries, lots of memory leaks.
* The player DNPlay now plays annodex, dislpays subtitles and shows the cmml desc tag in a text field on the player.
* Reincluded the interface that VS2002 couldn't compile


Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-07-14 18:46:00 UTC (rev 7122)
@@ -27,6 +27,12 @@
}
"Entry"
{
+        "MsmKey" = "8:_10DB6866DFED66BBB0880F2999B25EA1"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -45,6 +51,24 @@
}
"Entry"
{
+        "MsmKey" = "8:_2BCA6A72916D5849383EDFD6B61B8E1D"
+        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2BCA6A72916D5849383EDFD6B61B8E1D"
+        "OwnerKey" = "8:_10DB6866DFED66BBB0880F2999B25EA1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2BCA6A72916D5849383EDFD6B61B8E1D"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_2C5F38B64D1B4026848AEB8788C27EFC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -69,390 +93,522 @@
}
"Entry"
{
-        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
-        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
-        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+        "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_10DB6866DFED66BBB0880F2999B25EA1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_2BCA6A72916D5849383EDFD6B61B8E1D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_738B19A23EEF401DBF7A10DAF835D1F3"
-        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+        "MsmKey" = "8:_49418214E31E4039A76585CF41F34ABF"
+        "OwnerKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_7508A3C0459B47439D67D2C7249DD169"
+        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+        "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+        "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+        "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DD3F37DC11D54B5996F597343A185E03"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_AFF84F5FBA224F8A8D4BB3ACA539DC8B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_7508A3C0459B47439D67D2C7249DD169"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+        "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7508A3C0459B47439D67D2C7249DD169"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+        "OwnerKey" = "8:_10DB6866DFED66BBB0880F2999B25EA1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+        "OwnerKey" = "8:_2BCA6A72916D5849383EDFD6B61B8E1D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -489,6 +645,12 @@
}
"Entry"
{
+        "MsmKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -525,6 +687,12 @@
}
"Entry"
{
+        "MsmKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -586,6 +754,13 @@
{
"LaunchCondition"
{
+                "{2522A265-4974-4402-83C5-3B575A2E935A}:_DCE8BBD956374862B7189CD44BFF7562"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "SupportedRuntimes" = "8:1.1.4322"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=9832"
+                }
}
}
"Feature"
@@ -593,6 +768,37 @@
}
"File"
{
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_10DB6866DFED66BBB0880F2999B25EA1"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:libDSPlayDotNET, Version=1.0.1656.6755, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_10DB6866DFED66BBB0880F2999B25EA1"
+                    {
+                    "Name" = "8:libDSPlayDotNET.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:libDSPlayDotNET.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_1ED42AE022EB477985E46FA18A63F9A5"
{
"SourcePath" = "8:..\\..\\AUTHORS"
@@ -613,6 +819,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_2BCA6A72916D5849383EDFD6B61B8E1D"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:libCMMLTagsDotNET, Version=1.0.1656.6358, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_2BCA6A72916D5849383EDFD6B61B8E1D"
+                    {
+                    "Name" = "8:libcmmltagsdotnet.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:libcmmltagsdotnet.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_2C5F38B64D1B4026848AEB8788C27EFC"
{
"SourcePath" = "8:..\\..\\HISTORY"
@@ -653,6 +890,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
+            {
+            "SourcePath" = "8:MSVCP71D.dll"
+            "TargetName" = "8:MSVCP71D.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
"SourcePath" = "8:WSOCK32.dll"
@@ -673,10 +930,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_57E27F72FF7790C3FF18D6AB1F49D444"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_655D5383153A6AB10D15352A7EABCC7A"
{
-            "SourcePath" = "8:MSVCP70D.dll"
-            "TargetName" = "8:MSVCP70D.dll"
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -713,10 +970,21 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_9A2ADE669A100D71F9E0B3753CDA677A"
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_91763CD4DC02EBA9D077B963E618A278"
{
-            "SourcePath" = "8:MSVCR70D.dll"
-            "TargetName" = "8:MSVCR70D.dll"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1656.6337, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_91763CD4DC02EBA9D077B963E618A278"
+                    {
+                    "Name" = "8:libiwrapper.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:libiwrapper.dll"
+            "TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -729,7 +997,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
-            "Exclude" = "11:FALSE"
+            "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -2202,27 +2470,16 @@
}
"MergeModule"
{
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_738B19A23EEF401DBF7A10DAF835D1F3"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_49418214E31E4039A76585CF41F34ABF"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_crt.msm"
+            "SourcePath" = "8:dotnetfxredist_x86.msm"
"Properties"
{
-                    "DIR_RETARGET_TARGETDIR"
-                    {
-                    "Name" = "8:DIR_RETARGET_TARGETDIR"
-                    "DisplayName" = "8:Module Retargetable Folder"
-                    "Description" = "8:"
-                    "Type" = "3:10"
-                    "ContextData" = "8:IsolationDir"
-                    "Attributes" = "3:6"
-                    "Setting" = "3:1"
-                    "UsePlugInResources" = "11:FALSE"
-                    }
}
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
+            "LanguageId" = "3:1033"
+            "Exclude" = "11:TRUE"
"Folder" = "8:"
"Feature" = "8:"
"IsolateTo" = "8:"
@@ -2622,6 +2879,34 @@
{
}
}
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_6F3796EC49CD4C9CBDDD077F059CA73B"
+            {
+            "SourcePath" = "8:..\\..\\src\\lib\\helper\\libiWrapper\\Debug\\libiWrapper.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{FCFE729D-EADE-45BA-9506-7E82A46403F7}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
{
"SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioDecoder\\Debug\\dsfAbstracOggAudioDecoder.dll"
@@ -2678,6 +2963,34 @@
{
}
}
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_79FF0B1DD62A45B4AC907B30008DA5D2"
+            {
+            "SourcePath" = "8:..\\..\\src\\lib\\player\\libDSPlayDotNET\\Debug\\libDSPlayDotNET.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
@@ -2902,6 +3215,34 @@
{
}
}
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DAE083F8E57A4B28B67607B3FB4826E5"
+            {
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTagsDotNET\\Debug\\libCMMLTagsDotNET.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
@@ -3070,6 +3411,34 @@
{
}
}
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EE4A127518E84295835DA5640EBB17B2"
+            {
+            "SourcePath" = "8:..\\..\\src\\tools\\DNPlay\\obj\\Debug\\DNPlay.exe"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-14 18:46:00 UTC (rev 7122)
@@ -15,8 +15,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAbstractAudioDecoder", "..\..\src\lib\core\directshow\dsfAbstractAudioDecoder\dsfAbstractAudioDecoder.vcproj", "{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSeeking", "..\..\src\lib\core\directshow\dsfSeeking\dsfSeeking.vcproj", "{A882A968-3013-4A27-B653-E18CF5C791FE}"
@@ -36,24 +36,24 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAbstractVideoDecoder", "..\..\src\lib\core\directshow\dsfAbstractVideoDecoder\dsfAbstractVideoDecoder.vcproj", "{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux", "..\..\src\lib\core\directshow\dsfOggDemux\dsfOggDemux.vcproj", "{AE32588D-2807-4796-9E68-C9104817BC1A}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggMux", "..\..\src\lib\core\directshow\dsfOggMux\dsfOggMux.vcproj", "{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "..\..\src\lib\codecs\flac\libs\libflac\src\libFLAC\libFLAC_dynamic.vcproj", "{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}"
@@ -67,11 +67,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis_dynamic", "..\..\src\lib\codecs\vorbis\libs\libvorbis\win32\vorbis_dynamic.vcproj", "{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}"
@@ -82,10 +82,10 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfishsound", "..\..\src\lib\codecs\helper\libfishsound\win32\libfishsound.vcproj", "{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}"
@@ -101,29 +101,29 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "..\..\src\lib\codecs\theora\libs\libtheora\win32\libtheora\libtheora.vcproj", "{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}"
@@ -133,17 +133,17 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggDump", "..\..\src\tools\OOOggDump\OOOggDump.vcproj", "{73D3CA81-3BDC-42F1-8456-76224F6B337C}"
@@ -153,782 +153,782 @@
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "oggcodecs", "..\..\build\oggcodecs\oggcodecs.vdproj", "{3214DF66-3E46-4E44-BF9D-BC7502B88C29}"
ProjectSection(ProjectDependencies) = postProject
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189} = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5} = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggStat", "..\..\src\tools\OOOggStat\OOOggStat.vcproj", "{48CFEC13-E2BC-412F-8ECA-29090C7193B6}"
@@ -938,11 +938,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxDemux", "..\..\src\lib\core\directshow\dsfAnxDemux\dsfAnxDemux.vcproj", "{F9F22B14-22FE-4651-81B8-5AE267A6B189}"
ProjectSection(ProjectDependencies) = postProject
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{AE32588D-2807-4796-9E68-C9104817BC1A} = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTags", "..\..\src\lib\codecs\cmml\libCMMLTags\libCMMLTags.vcproj", "{AD38DCC6-B431-4B32-8569-74F3376EF2DA}"
@@ -961,10 +961,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{AD2DC5BB-AC7B-482D-9472-19BB98A833CE} = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
EndProjectSection
@@ -976,9 +976,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
ProjectSection(ProjectDependencies) = postProject
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisComment", "..\..\src\lib\core\ogg\libVorbisComment\libVorbisComment.vcproj", "{DC4D86E2-72C1-4995-8FB1-0F08655E620A}"
@@ -987,8 +987,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggCommentDump", "..\..\src\tools\OOOggCommentDump\OOOggCommentDump.vcproj", "{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}"
ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLOgg", "..\..\src\tools\CLOgg\CLOgg.vcproj", "{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}"
@@ -998,8 +998,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDSPlayDotNET", "..\..\src\lib\player\libDSPlayDotNET\libDSPlayDotNET.vcproj", "{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
ProjectSection(ProjectDependencies) = postProject
{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6} = {9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiWrapper", "..\..\src\lib\helper\libiWrapper\libiWrapper.vcproj", "{FCFE729D-EADE-45BA-9506-7E82A46403F7}"
@@ -1008,11 +1008,13 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNPlay", "..\..\src\tools\DNPlay\DNPlay.csproj", "{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}"
ProjectSection(ProjectDependencies) = postProject
+		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6} = {9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}
{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCDROM", "..\..\src\lib\helper\libCDROM\libCDROM.vcproj", "{53C3466C-6107-41CD-80D2-5F1D423D66F3}"
@@ -1026,8 +1028,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTagsDotNET", "..\..\src\lib\codecs\cmml\libCMMLTagsDotNET\libCMMLTagsDotNET.vcproj", "{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
ProjectSection(ProjectDependencies) = postProject
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
EndProjectSection
EndProject
Global

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,3 +1,5 @@
+#pragma once
+#pragma message("Getting CMML IIDS")
// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
DEFINE_GUID(IID_ICMMLAppControl,
0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,9 +1,9 @@


/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
//Mutators
void setStream(C_StreamTag* inStreamTag);
void setHead(C_HeadTag* inHeadTag);
-	void C_CMMLRootTag::setClipList(C_ClipTagList* inClipList);
+	void setClipList(C_ClipTagList* inClipList);

//Other
virtual string toString();

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@


void C_CMMLTag::privateClone(C_CMMLTag* outTag) {
-	outTag->mId = mId;
+	outTag->setId(mId);
}



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -82,12 +82,15 @@
mTrack = inTrack;
}
void C_ClipTag::setAnchor(C_AnchorTag* inAnchor) {
+	delete mAnchor;
mAnchor = inAnchor;
}
void C_ClipTag::setImage(C_ImageTag* inImage) {
+	delete mImage;
mImage = inImage;
}
void C_ClipTag::setDesc(C_DescTag* inDesc) {
+	delete mDesc;
mDesc = inDesc;
}

@@ -116,11 +119,11 @@
C_HumReadCMMLTag::privateClone(outTag);
C_ClipTag* locTag = reinterpret_cast<C_ClipTag*>(outTag);
locTag->mTrack = mTrack;
-	locTag->mAnchor = mAnchor;
-	locTag->mImage = mImage;
-	locTag->mDesc = mDesc;
-	locTag->mStart = mStart;
-	locTag->mEnd = mEnd;
+	locTag->setAnchor(mAnchor->clone());
+	locTag->setImage(mImage->clone());
+	locTag->setDesc(mDesc->clone());
+	locTag->setStart(mStart);
+	locTag->setEnd(mEnd);
}
string C_ClipTag::toString() {
string retStr = "<clip";

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -68,9 +68,11 @@
mProfile = inProfile;
}
void C_HeadTag::setTitle(C_TitleTag* inTitle) {
+	delete mTitle;
mTitle = inTitle;
}
void C_HeadTag::setBase(C_BaseTag* inBase) {
+	delete mBase;
mBase = inBase;
}
//Other
@@ -78,9 +80,11 @@
void C_HeadTag::privateClone(C_CMMLTag* outTag) {
C_HumReadCMMLTag::privateClone(outTag);
C_HeadTag* locTag = reinterpret_cast<C_HeadTag*>(outTag);
-	locTag->mProfile = mProfile;
-	locTag->mTitle = mTitle;
-	locTag->setBase(mBase->clone());
+	locTag->setProfile(mProfile);
+	//locTag->mTitle = mTitle;
+	if (mBase != NULL) {
+		locTag->setBase(mBase->clone());
+	}
locTag->setTitle(mTitle->clone());
}
C_CMMLTag* C_HeadTag::genericClone() {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,6 @@
void C_HumReadCMMLTag::privateClone(C_CMMLTag* outTag) {
C_CMMLTag::privateClone(outTag);
C_HumReadCMMLTag* locTag = reinterpret_cast<C_HumReadCMMLTag*>(outTag);
-	locTag->mLang = mLang;
-	locTag->mDirn = mDirn;
+	locTag->setLang(mLang);
+	locTag->setDirn(mDirn);
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -64,8 +64,8 @@
void C_ImageTag::privateClone(C_CMMLTag* outTag) {
C_HumReadCMMLTag::privateClone(outTag);
C_ImageTag* locTag = reinterpret_cast<C_ImageTag*>(outTag);
-	locTag->mSrc = mSrc;
-	locTag->mAlt = mAlt;
+	locTag->setSrc(mSrc);
+	locTag->setAlt(mAlt);
}

C_ImageTag* C_ImageTag::clone() {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -100,12 +100,12 @@

C_HumReadCMMLTag::privateClone(outTag);
C_ImportTag* locTag = reinterpret_cast<C_ImportTag*>(outTag);
-	locTag->mGranuleRate = mGranuleRate;
-	locTag->mContentType = mContentType;
-	locTag->mSrc = mSrc;
-	locTag->mStart = mStart;
-	locTag->mEnd = mEnd;
-	locTag->mTitle = mTitle;
+	locTag->setGranuleRate(mGranuleRate);
+	locTag->setContentType(mContentType);
+	locTag->setSrc(mSrc );
+	locTag->setStart(mStart);
+	locTag->setEnd(mEnd);
+	locTag->setTitle(mTitle);
locTag->setParamList(mParamList->clone());
}
C_ImportTag* C_ImportTag::clone() {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
void setStart(string inStart);
void setEnd(string inEnd);
void setTitle(string inTitle);
-	void C_ImportTag::setParamList(C_ParamTagList* inParamList);
+	void setParamList(C_ParamTagList* inParamList);

//Other
virtual string toString();

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,6 @@
void C_MappedTag::privateClone(C_CMMLTag* outTag) {
C_HumReadCMMLTag::privateClone(outTag);
C_MappedTag* locTag = reinterpret_cast<C_MappedTag*>(outTag);
-	locTag->mName = mName;
-	locTag->mContent = mContent;
+	locTag->setName(mName);
+	locTag->setContent(mContent);
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@
void C_MetaTag::privateClone(C_CMMLTag* outTag) {
C_MappedTag::privateClone(outTag);
C_MetaTag* locTag = reinterpret_cast<C_MetaTag*>(outTag);
-	locTag->mScheme = mScheme;
+	locTag->setScheme(mScheme);
}
C_MetaTag* C_MetaTag::clone() {
C_MetaTag* retTag = new C_MetaTag;

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,8 @@
void C_StreamTag::privateClone(C_CMMLTag* outTag) {
C_CMMLTag::privateClone(outTag);
C_StreamTag* locTag = reinterpret_cast<C_StreamTag*>(outTag);
-	locTag->mUtc = mUtc;
-	locTag->mTimebase = mTimebase;
+	locTag->setUtc(mUtc);
+	locTag->setTimebase(mTimebase);

}


Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -54,4 +54,5 @@

void C_TextFieldTag::privateClone(C_CMMLTag* outTag) {
C_HumReadCMMLTag::privateClone(outTag);
+	((C_TextFieldTag*)outTag)->setText(mText);
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,19 +1,7 @@
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the LIBCMMLTAGS_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// LIBCMMLTAGS_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef LIBCMMLTAGS_EXPORTS
-#define LIBCMMLTAGS_API __declspec(dllexport)
-#else
-#define LIBCMMLTAGS_API __declspec(dllimport)
-#endif
-
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -43,6 +31,20 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+// The following ifdef block is the standard way of creating macros which make exporting
+// from a DLL simpler. All files within this DLL are compiled with the LIBCMMLTAGS_EXPORTS
+// symbol defined on the command line. this symbol should not be defined on any project
+// that uses this DLL. This way any other project whose source files include this file see
+// LIBCMMLTAGS_API functions as being imported from a DLL, whereas this DLL sees symbols
+// defined with this macro as being exported.
+#ifdef LIBCMMLTAGS_EXPORTS
+#define LIBCMMLTAGS_API __declspec(dllexport)
+#else
+#define LIBCMMLTAGS_API __declspec(dllimport)
+#endif
+
+
#include "config.h"

// These classes are exported from the cpp_lib_cmml.dll

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,7 +1,7 @@
/*
-   Copyright (C) 2003 Zentaro Kavanagh
+   Copyright (C) 2003, 2004 Zentaro Kavanagh

-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,13 +30,13 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#include "StdAfx.h"
#include ".\anchortag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

AnchorTag::AnchorTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -44,7 +46,7 @@
#pragma managed


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AssemblyInfo.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AssemblyInfo.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AssemblyInfo.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "stdafx.h"

using namespace System::Reflection;

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,13 +30,13 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#include "StdAfx.h"
#include ".\basetag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

BaseTag::BaseTag(void) {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once


@@ -44,7 +46,7 @@
#include <C_BaseTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\cmmldoc.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -46,7 +48,7 @@
#include <C_CMMLRootTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class CMMLDoc

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\cmmlpreamble.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -41,7 +43,7 @@
#include <C_CMMLPreamble.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\cmmlroottag.h"
#using <mscorlib.dll>

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

CMMLRootTag::CMMLRootTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -45,7 +47,7 @@
#include <C_CMMLRootTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class CMMLRootTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -34,7 +36,7 @@
#include ".\cmmltag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

CMMLTag::CMMLTag(void) {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -40,7 +42,7 @@
#include <C_CMMLTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#include "StdAfx.h"
#include ".\cliptag.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

ClipTag::ClipTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -46,7 +48,7 @@
#include <C_ClipTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ClipTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#include "StdAfx.h"
#include ".\cliptaglist.h"
-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -44,7 +46,7 @@
#include <C_ClipTagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ClipTagList

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\desctag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

DescTag::DescTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -42,7 +44,7 @@
#include <C_DescTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

////Other

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,13 +30,13 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\headtag.h"



-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

HeadTag::HeadTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#pragma once

@@ -46,7 +48,7 @@
#include <C_HeadTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class HeadTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\humreadcmmltag.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

HumReadCMMLTag::HumReadCMMLTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

#pragma once

@@ -45,7 +47,7 @@
#include <C_HumReadCMMLTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class HumReadCMMLTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\imagetag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

ImageTag::ImageTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once


@@ -44,7 +46,7 @@
#include <C_ImageTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ImageTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,13 +30,13 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\importtag.h"



-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

ImportTag::ImportTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -43,7 +45,7 @@
#include <C_ImportTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ImportTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\importtaglist.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

ImportTagList::ImportTagList(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -43,7 +45,7 @@
#include <C_ImportTagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ImportTagList

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\mappedtag.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

MappedTag::MappedTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once


@@ -43,7 +45,7 @@
#include <C_MappedTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\mappedtaglist.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

MappedTagList::MappedTagList(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -41,7 +43,7 @@
#include <C_MappedTagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class MappedTagList

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\metatag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

MetaTag::MetaTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -42,7 +44,7 @@
#include <C_MetaTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class MetaTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -33,7 +35,7 @@
#include ".\metataglist.h"
#using <mscorlib.dll>

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

MetaTagList::MetaTagList(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -43,7 +45,7 @@
#include <C_MetaTagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\paramtag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

ParamTag::ParamTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once


@@ -43,7 +45,7 @@
#include <C_ParamTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ParamTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\paramtaglist.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -43,7 +45,7 @@
#include <C_ParamTagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class ParamTagList

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/Stdafx.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/

// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\streamtag.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once


@@ -46,7 +48,7 @@
#include <C_StreamTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc  class StreamTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\taglist.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -42,7 +44,7 @@
#include <C_TagList.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class TagList

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,11 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\textfieldtag.h"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

TextFieldTag::TextFieldTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#pragma once

using namespace System;
@@ -44,7 +46,7 @@



-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,12 +30,12 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
#include "StdAfx.h"
#include ".\titletag.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

TitleTag::TitleTag(void)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,11 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
+
+
+
+
#pragma once


@@ -45,7 +51,7 @@
#include <C_TitleTag.h>
#pragma managed

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {

public __gc class TitleTag

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -36,7 +38,7 @@
#include "libCMMLTagsDotNET.h"


-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {
}
}

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,7 @@
/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Copyright (C) 2003, 2004 Zentaro Kavanagh
+
+   Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia

Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/


#pragma once
@@ -36,7 +38,7 @@
using namespace System;
#using "libiWrapper.dll"

-namespace CSIRO {
+namespace illiminable {
namespace libCMMLTagsDotNET {



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj	2004-07-14 18:46:00 UTC (rev 7122)
@@ -35,7 +35,8 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/libCMMLTagsDotNET.dll"
LinkIncremental="2"
-				GenerateDebugInformation="TRUE"/>
+				GenerateDebugInformation="TRUE"
+				ResourceOnlyDLL="FALSE"/>
<Tool
Name="VCMIDLTool"/>
<Tool

Modified: trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj	2004-07-14 18:46:00 UTC (rev 7122)
@@ -34,7 +34,8 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/libiWrapper.dll"
LinkIncremental="2"
-				GenerateDebugInformation="TRUE"/>
+				GenerateDebugInformation="TRUE"
+				ResourceOnlyDLL="FALSE"/>
<Tool
Name="VCMIDLTool"/>
<Tool

Added: trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.cpp
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -0,0 +1,36 @@
+#include "StdAfx.h"
+#include ".\cmmlcallbackproxy.h"
+#using <mscorlib.dll>
+
+CMMLCallbackProxy::CMMLCallbackProxy(void)
+	:	mDNCMMLCallbacks(NULL)
+{
+}
+
+CMMLCallbackProxy::~CMMLCallbackProxy(void)
+{
+}
+
+bool CMMLCallbackProxy::setManagedDelegate(gcroot<IDNCMMLCallbacks*> inManagedCallbacks) {
+	mDNCMMLCallbacks = inManagedCallbacks;
+
+}
+bool CMMLCallbackProxy::clipCallback(C_ClipTag* inClipTag) {
+	if (mDNCMMLCallbacks != NULL) {
+		gcroot<ClipTag*> locClip = new ClipTag(inClipTag->clone());
+
+		return mDNCMMLCallbacks->clipCallback(locClip);
+	} else {
+		return false;
+	}
+}
+bool CMMLCallbackProxy::headCallback(C_HeadTag* inHeadTag) {
+	if (mDNCMMLCallbacks != NULL) {
+		gcroot<HeadTag*> locHead = new HeadTag(inHeadTag->clone());
+
+		return mDNCMMLCallbacks->headCallback(locHead);
+	} else {
+		return false;
+	}
+
+}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/CMMLCallbackProxy.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -0,0 +1,22 @@
+#pragma once
+#include "ICMMLCallbacks.h"
+#include "libCMMLTags.h"
+#include "IDNCMMLCallbacks.h"
+#include <vcclr.h>
+
+using namespace illiminable::libDSPlayDotNET;
+class CMMLCallbackProxy
+	:	public ICMMLCallbacks
+{
+public:
+	CMMLCallbackProxy(void);
+	~CMMLCallbackProxy(void);
+
+	virtual bool clipCallback(C_ClipTag* inClipTag);
+	virtual bool headCallback(C_HeadTag* inHeadTag);
+
+	bool setManagedDelegate(gcroot<IDNCMMLCallbacks*> inManagedCallbacks);
+
+protected:
+	gcroot<IDNCMMLCallbacks*> mDNCMMLCallbacks;
+};

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -14,16 +14,20 @@
//		Int64 queryPosition();
//};

+
+
DSPlay::DSPlay(void)
:	mGraphBuilder(NULL)
,	mMediaControl(NULL)
,	mMediaSeeking(NULL)
,	mMediaEvent(NULL)
,	mEventHandle(INVALID_HANDLE_VALUE)
-	,	mDNCMMLCallbacks(NULL)
+	//,	mDNCMMLCallbacks(NULL)
,	mDNMediaEvent(NULL)
+	,	mCMMLAppControl(NULL)
{
CoInitialize(NULL);
+	mCMMLProxy = new CMMLCallbackProxy;			//Need to delete this !
}

bool DSPlay::checkEvents() {
@@ -101,6 +105,11 @@
mMediaEvent = NULL;
}

+	if (mCMMLAppControl != NULL) {
+		mCMMLAppControl->Release();
+		mCMMLAppControl = NULL;
+	}
+
//TODO::: Release everything !
}

@@ -144,6 +153,8 @@
}
}

+
+
}

//Build the graph
@@ -154,6 +165,24 @@
return false;
}

+	if (isFileAnnodex(inFileName)) {
+		//Get the app control interface for CMML.
+		IBaseFilter* locCMMLFilter = NULL;
+		locHR = mGraphBuilder->FindFilterByName(L"CMML Decode Filter", &locCMMLFilter);
+
+		if (locCMMLFilter != NULL) {
+			ICMMLAppControl* locCMMLAppControl = NULL;
+
+			locHR = locCMMLFilter->QueryInterface(X_IID_ICMMLAppControl, (void**)&locCMMLAppControl);
+			if (locCMMLAppControl != NULL) {
+				mCMMLAppControl = locCMMLAppControl;
+				mCMMLAppControl->setCallbacks(mCMMLProxy);
+			}
+		}
+
+	}
+
+
//Get the media control interface
IMediaControl* locMediaControl = NULL;
locHR = mGraphBuilder->QueryInterface(IID_IMediaControl, (void**)&locMediaControl);
@@ -189,13 +218,17 @@

}

+bool DSPlay::setCMMLCallbacks(IDNCMMLCallbacks* inCMMLCallbacks) {
+	return mCMMLProxy->setManagedDelegate(inCMMLCallbacks);
+}
+
bool DSPlay::isLoaded() {
return mIsLoaded;
}
bool DSPlay::play() {
if (mIsLoaded) {
HRESULT locHR = mMediaControl->Run();
-		if (locHR != S_OK) {
+		if (SUCCEEDED(locHR)) {
return false;
} else {
return true;

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,17 +1,22 @@
#pragma once
#pragma unmanaged
+//#include "CMMLDecoderIIDs.h"
#include <uuids.h>
#include <dshow.h>

#include <d3d9.h>
#include <vmr9.h>
#include <string>
+
#include "ICMMLCallbacks.h"
+#include "ICMMLAppControl.h"
#include "libCMMLTags.h"
+#include "CMMLCallbackProxy.h"

+
#pragma managed
#using "libCMMLTagsDotNET.dll"
-using namespace CSIRO::libCMMLTagsDotNET;
+using namespace illiminable::libCMMLTagsDotNET;
#include "libDSPlayDotNet.h"
#include "IDNCMMLCallbacks.h"
#include "IDNMediaEvent.h"
@@ -22,6 +27,7 @@
namespace illiminable {
namespace libDSPlayDotNET
{
+
public __gc class DSPlay
{
public:
@@ -43,6 +49,8 @@

bool setMediaEventCallback(IDNMediaEvent* inMediaEventCallback);
IDNMediaEvent* getMediaEventCallback();
+
+		bool setCMMLCallbacks(IDNCMMLCallbacks* inCMMLCallbacks);
bool checkEvents();

void releaseInterfaces();
@@ -52,14 +60,19 @@
IMediaControl* mMediaControl;
IMediaSeeking* mMediaSeeking;
IMediaEvent* mMediaEvent;
+		ICMMLAppControl* mCMMLAppControl;

HANDLE mEventHandle;

-		IDNCMMLCallbacks* mDNCMMLCallbacks;
+		//IDNCMMLCallbacks* mDNCMMLCallbacks;
+		CMMLCallbackProxy* mCMMLProxy;
IDNMediaEvent* mDNMediaEvent;

bool mIsLoaded;
bool isFileAnnodex(String* inFilename);
+
+
+
};
}
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/IDNCMMLCallbacks.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/IDNCMMLCallbacks.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/IDNCMMLCallbacks.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -4,11 +4,11 @@

#pragma managed
#using "libCMMLTagsDotNET.dll"
-using namespace CSIRO::libCMMLTagsDotNET;
+using namespace illiminable::libCMMLTagsDotNET;

namespace illiminable {
namespace libDSPlayDotNET {
-public __gc interface IDNCMMLCallbacks {
+public __gc __interface IDNCMMLCallbacks {
//class ICMMLCallbacks
//{
//public:
@@ -16,10 +16,10 @@
//	virtual bool headCallback(C_HeadTag* inHeadTag) = 0;
//};
public:
-	//virtual bool clipCallback(ClipTag* inClipTag) = 0;
-	//bool headCallback(HeadTag* inHeadTag);
+	virtual bool clipCallback(ClipTag* inClipTag) = 0;
+	virtual bool headCallback(HeadTag* inHeadTag) = 0;

-private:
+




Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.cpp	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.cpp	2004-07-14 18:46:00 UTC (rev 7122)
@@ -3,3 +3,4 @@
// stdafx.obj will contain the pre-compiled type information

#include "stdafx.h"
+// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/Stdafx.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -10,4 +10,6 @@
#include <dshow.h>
//#include <windows.h>

+//#include <guiddef.h>
+// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
#pragma managed

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.h	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.h	2004-07-14 18:46:00 UTC (rev 7122)
@@ -7,7 +7,7 @@
#pragma managed
#using "libiWrapper.dll"
#using "libCMMLTagsDotNET.dll"
-using namespace CSIRO::libCMMLTagsDotNET;
+using namespace illiminable::libCMMLTagsDotNET;
using namespace std;

using namespace System;
@@ -24,6 +24,8 @@
//			Int64 queryPosition();
//	}*/

+	static const GUID X_IID_ICMMLAppControl = {0x6188ad0c, 0x62cb, 0x4658, {0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31}};
+	//DEFINE_GUID(IID_ICMMLAppControl, 0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
static wstring toWStr(std::string inString) {

//This is frmo the String Helper class.

Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj	2004-07-14 18:46:00 UTC (rev 7122)
@@ -38,7 +38,8 @@
OutputFile="$(OutDir)/libDSPlayDotNET.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\helper\libiWrapper\Debug;C:\DXSDK\Lib"
-				GenerateDebugInformation="TRUE"/>
+				GenerateDebugInformation="TRUE"
+				ResourceOnlyDLL="FALSE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -120,6 +121,9 @@
RelativePath="AssemblyInfo.cpp">
</File>
<File
+				RelativePath=".\CMMLCallbackProxy.cpp">
+			</File>
+			<File
RelativePath="DSPlay.cpp">
</File>
<File
@@ -145,6 +149,9 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc">
<File
+				RelativePath=".\CMMLCallbackProxy.h">
+			</File>
+			<File
RelativePath="DSPlay.h">
</File>
<File

Modified: trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj	2004-07-14 18:46:00 UTC (rev 7122)
@@ -94,6 +94,11 @@
Project = "{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
Package = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
/>
+                <Reference
+                    Name = "libCMMLTagsDotNET"
+                    Project = "{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
+                    Package = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+                />
</References>
</Build>
<Files>

Modified: trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,5 +1,5 @@
<VisualStudioProject>
-    <CSHARP>
+    <CSHARP LastOpenVersion = "7.10.3077" >
<Build>
<Settings ReferencePath = "" >
<Config

Modified: trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs	2004-07-14 18:46:00 UTC (rev 7122)
@@ -5,13 +5,15 @@
using System.Windows.Forms;
using System.Data;
using illiminable.libDSPlayDotNET;
+using illiminable.libCMMLTagsDotNET;

+
namespace DNPlay
{
/// <summary>
/// Summary description for Form1.
/// </summary>
-	public class frmDNPlay : System.Windows.Forms.Form, IDNMediaEvent
+	public class frmDNPlay : System.Windows.Forms.Form, IDNMediaEvent, IDNCMMLCallbacks
{
private System.Windows.Forms.MainMenu mainMenu1;
private System.Windows.Forms.MenuItem menuItem1;
@@ -38,6 +40,9 @@
protected Int64 mLastSync;
private System.Windows.Forms.Timer tmrEventCheck;
protected Int64 mNumTicks;
+		protected ClipTag mCurrentClip;
+		private System.Windows.Forms.Label lblClipDesc;
+		protected HeadTag mHeadTag;

enum eEventCodes
{
@@ -93,6 +98,19 @@
}
return true;
}
+
+		//Implementing IDNCMMLCallbacks
+		public bool clipCallback(ClipTag inClipTag)
+		{
+			mCurrentClip = inClipTag;
+			lblClipDesc.Text = inClipTag.desc().text();
+			return true;
+		}
+		public bool headCallback(HeadTag inHeadTag)
+		{
+			mHeadTag = inHeadTag;
+			return true;
+		}
//

public frmDNPlay()
@@ -153,6 +171,7 @@
this.lblProgressBkgd = new System.Windows.Forms.Label();
this.lblProgressFgnd = new System.Windows.Forms.Label();
this.tmrEventCheck = new System.Windows.Forms.Timer(this.components);
+			this.lblClipDesc = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// mainMenu1
@@ -285,18 +304,26 @@
this.tmrEventCheck.Interval = 250;
this.tmrEventCheck.Tick += new System.EventHandler(this.tmrEventCheck_Tick);
//
+			// lblClipDesc
+			//
+			this.lblClipDesc.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.lblClipDesc.Location = new System.Drawing.Point(8, 96);
+			this.lblClipDesc.Name = "lblClipDesc";
+			this.lblClipDesc.Size = new System.Drawing.Size(400, 104);
+			this.lblClipDesc.TabIndex = 10;
+			//
// frmDNPlay
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-			this.ClientSize = new System.Drawing.Size(416, 87);
-			this.Controls.AddRange(new System.Windows.Forms.Control[] {
-																		  this.lblProgressFgnd,
-																		  this.lblProgressBkgd,
-																		  this.lblDuration,
-																		  this.cmdPause,
-																		  this.cmdStop,
-																		  this.lblFileLocation,
-																		  this.cmdPlay});
+			this.ClientSize = new System.Drawing.Size(416, 207);
+			this.Controls.Add(this.lblClipDesc);
+			this.Controls.Add(this.lblProgressFgnd);
+			this.Controls.Add(this.lblProgressBkgd);
+			this.Controls.Add(this.lblDuration);
+			this.Controls.Add(this.cmdPause);
+			this.Controls.Add(this.cmdStop);
+			this.Controls.Add(this.lblFileLocation);
+			this.Controls.Add(this.cmdPlay);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.MaximizeBox = false;
this.Menu = this.mainMenu1;
@@ -340,7 +367,7 @@
updateProgressBar();

mPlayer.setMediaEventCallback(this);
-
+				mPlayer.setCMMLCallbacks(this);
cmdPlay.Enabled = true;
}


Modified: trunk/oggdsf/src/tools/DNPlay/frmDNPlay.resx
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/frmDNPlay.resx	2004-07-14 07:06:50 UTC (rev 7121)
+++ trunk/oggdsf/src/tools/DNPlay/frmDNPlay.resx	2004-07-14 18:46:00 UTC (rev 7122)
@@ -1,62 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
-            Microsoft ResX Schema
-
-            Version 1.3
+    Microsoft ResX Schema
+
+    Version 1.3
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>

-            The primary goals of this format is to allow a simple XML format
-            that is mostly human readable. The generation and parsing of the
-            various data types are done through the TypeConverter classes
-            associated with the data types.
-
-            Example:
-
-                ... ado.net/XML headers & schema ...
-                <resheader name="resmimetype">text/microsoft-resx</resheader>
-                <resheader name="version">1.3</resheader>
-                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-                <data name="Name1">this is my long string</data>
-                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-                    [base64 mime encoded serialized .NET Framework object]
-                </data>
-                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
-                </data>
-
-            There are any number of "resheader" rows that contain simple
-            name/value pairs.
-
-            Each data row contains a name, and value. The row also contains a
-            type or mimetype. Type corresponds to a .NET class that support
-            text/value conversion through the TypeConverter architecture.
-            Classes that don't support this are serialized and stored with the
-            mimetype set.
-
-            The mimetype is used for serialized objects, and tells the
-            ResXResourceReader how to depersist the object. This is currently not
-            extensible. For a given mimetype the value must be set accordingly:
-
-            Note - application/x-microsoft.net.object.binary.base64 is the format
-                   that the ResXResourceWriter will generate, however the reader can
-                   read any of the formats listed below.
-
-            mimetype: application/x-microsoft.net.object.binary.base64
-            value   : The object must be serialized with
-                    : System.Serialization.Formatters.Binary.BinaryFormatter
-                    : and then encoded with base64 encoding.
-
-            mimetype: application/x-microsoft.net.object.soap.base64
-            value   : The object must be serialized with
-                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-                    : and then encoded with base64 encoding.
-            mimetype: application/x-microsoft.net.object.bytearray.base64
-            value   : The object must be serialized into a byte array
-                    : using a System.ComponentModel.TypeConverter
-                    : and then encoded with base64 encoding.
-        -->
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used forserialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
@@ -91,23 +92,188 @@
<value>1.3</value>
</resheader>
<resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
-  <data name="mainMenu1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="mainMenu1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="mainMenu1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</data>
-  <data name="dlgOpenFile.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="mainMenu1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem7.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="menuItem7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="cmdPlay.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="cmdPlay.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="cmdPlay.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblFileLocation.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblFileLocation.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblFileLocation.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dlgOpenFile.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dlgOpenFile.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dlgOpenFile.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
</data>
-  <data name="tmrUpdateDuration.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="cmdStop.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="cmdStop.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="cmdStop.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="cmdPause.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="cmdPause.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="cmdPause.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblDuration.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblDuration.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblDuration.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tmrUpdateDuration.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tmrUpdateDuration.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>236, 17</value>
</data>
-  <data name="tmrEventCheck.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="tmrUpdateDuration.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblProgressBkgd.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblProgressBkgd.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblProgressBkgd.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblProgressFgnd.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblProgressFgnd.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblProgressFgnd.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tmrEventCheck.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tmrEventCheck.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>383, 17</value>
</data>
+  <data name="tmrEventCheck.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblClipDesc.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblClipDesc.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="lblClipDesc.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
<data name="$this.Name">
<value>frmDNPlay</value>
</data>



More information about the commits mailing list