OSDN Git Service

fix some merge error
authorunknown <hirom@.(none)>
Tue, 8 Dec 2009 10:54:24 +0000 (19:54 +0900)
committerhylom <hylom@silver.local>
Tue, 4 Jan 2011 12:28:01 +0000 (21:28 +0900)
commitade660813b9d39c77a25face7a5b418be3fd26c9
treee6c0efd54031928c18e7958dfbd04e969173abfd
parent42a08e4eed84796c20e0869de2089a573e10285b
fix some merge error
win/C#/HandBrakeCS.csproj
win/C#/frmQueue.Designer.cs