Fixed windows build conflict issues.

This commit is contained in:
Juan Carlos Luciani
2007-04-06 03:52:43 +00:00
parent 0bfc0a3063
commit 3f0062dcf7
4 changed files with 88 additions and 22 deletions

View File

@@ -33,7 +33,7 @@
}
"Entry"
{
"MsmKey" = "8:_C51BB367E3764A609C6892AA7214BA74"
"MsmKey" = "8:_ED75FB42562C44599CE8F9BF3EC1E6A9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -154,9 +154,9 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C51BB367E3764A609C6892AA7214BA74"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED75FB42562C44599CE8F9BF3EC1E6A9"
{
"SourcePath" = "8:..\\..\\..\\lib\\windows\\casa_authtoken.lib"
"SourcePath" = "8:..\\..\\..\\lib64\\windows\\casa_authtoken.lib"
"TargetName" = "8:casa_authtoken.lib"
"Tag" = "8:"
"Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"
@@ -271,7 +271,7 @@
{
"ModuleSignature" = "8:MergeModule.B69C6131ABDA4B6DB65B5F4806BE4E59"
"Version" = "8:1.0.0.0"
"Title" = "8:authtokenclientdevel-msm"
"Title" = "8:authtokenclientdevel64-msm"
"Subject" = "8:"
"Author" = "8:Novell, Inc."
"Keywords" = "8:"
@@ -287,7 +287,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_88C9C0D87C7449108D65C94EB7B367FE"
{
"SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
"SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"