Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge

avinationmerge
Melanie 2011-10-11 22:52:15 +01:00
commit 1b2849319c
1 changed files with 1 additions and 1 deletions

View File

@ -564,7 +564,7 @@
<Section Name="Default Iris Texture"> <Section Name="Default Iris Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/> <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/>
<Key Name="assetID" Value="6e610cae-3b0d-4729-b482-2c31ab2e49f9"/> <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
<Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
<Key Name="description" Value=""/> <Key Name="description" Value=""/>
<Key Name="name" Value="Default Iris Texture" /> <Key Name="name" Value="Default Iris Texture" />