OSDN Git Service

fix some merge error
authorunknown <hirom@.(none)>
Tue, 8 Dec 2009 10:54:24 +0000 (19:54 +0900)
committerunknown <hirom@.(none)>
Tue, 8 Dec 2009 10:54:24 +0000 (19:54 +0900)
commit295107a988b0d598ab6582c4af6eb0f41bee2106
tree39d64bf0d5eb8f8d3a18ce1c44f558739dfa843b
parentee932fa7c59d811e53dcab64bcaf0fce2527052d
fix some merge error
win/C#/HandBrakeCS.csproj
win/C#/frmMain.Designer.cs
win/C#/frmQueue.Designer.cs