Merge fixes

This commit is contained in:
gb.luke 2010-07-05 02:03:04 +00:00
parent e69139247e
commit e320c9409f

View File

@ -909,7 +909,7 @@ namespace NUS_Downloader
{
packbox.Checked = true;
packbox_CheckedChanged("scripted", new EventArgs());
deletecontentsbox.Checked = true;
keepenccontents.Checked = false;
wadnamebox.Enabled = false;
}
@ -3172,8 +3172,6 @@ namespace NUS_Downloader
// TODO: OnItemClicked...
}
}
private void aboutNUSDToolStripMenuItem_Click(object sender, EventArgs e)
@ -3274,7 +3272,6 @@ namespace NUS_Downloader
saveaswadbtn.Text = String.Empty;
saveaswadbtn.ImageAlign = ContentAlignment.MiddleCenter;
}
}
void nus_script_item_Click(object sender, EventArgs e)
{