Skip to content

Edge#420

Open
filisilviu wants to merge 18 commits into
masterfrom
edge
Open

Edge#420
filisilviu wants to merge 18 commits into
masterfrom
edge

Conversation

@filisilviu

Copy link
Copy Markdown

hihihihi

nwoolls added 18 commits June 11, 2014 02:16
Conflicts:
	Installer/VersionInfo.ini
	MultiMiner.CoinApi/Properties/AssemblyInfo.cs
	MultiMiner.CoinChoose/Properties/AssemblyInfo.cs
	MultiMiner.CoinWarz/Properties/AssemblyInfo.cs
	MultiMiner.Coinbase/Properties/AssemblyInfo.cs
	MultiMiner.Discovery/Properties/AssemblyInfo.cs
	MultiMiner.Engine/Properties/AssemblyInfo.cs
	MultiMiner.MobileMiner/Properties/AssemblyInfo.cs
	MultiMiner.Remoting/Properties/AssemblyInfo.cs
	MultiMiner.Services/Properties/AssemblyInfo.cs
	MultiMiner.Stats/Properties/AssemblyInfo.cs
	MultiMiner.Update/Properties/AssemblyInfo.cs
	MultiMiner.Utility/Properties/AssemblyInfo.cs
	MultiMiner.Win/Forms/MinerForm.cs
	MultiMiner.Win/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer.Api/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer.Discovery/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer/Properties/AssemblyInfo.cs
Conflicts:
	Installer/VersionInfo.ini
	MultiMiner.CoinApi/Properties/AssemblyInfo.cs
	MultiMiner.CoinChoose/Properties/AssemblyInfo.cs
	MultiMiner.CoinWarz/Properties/AssemblyInfo.cs
	MultiMiner.Coinbase/Properties/AssemblyInfo.cs
	MultiMiner.Discovery/Properties/AssemblyInfo.cs
	MultiMiner.Engine/Properties/AssemblyInfo.cs
	MultiMiner.MobileMiner/Properties/AssemblyInfo.cs
	MultiMiner.Remoting/Properties/AssemblyInfo.cs
	MultiMiner.Services/Properties/AssemblyInfo.cs
	MultiMiner.Stats/Properties/AssemblyInfo.cs
	MultiMiner.Update/Properties/AssemblyInfo.cs
	MultiMiner.Utility/Properties/AssemblyInfo.cs
	MultiMiner.Win/Forms/MinerForm.cs
	MultiMiner.Win/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer.Api/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer.Discovery/Properties/AssemblyInfo.cs
	MultiMiner.Xgminer/Properties/AssemblyInfo.cs
Conflicts:
	MultiMiner.Win/Forms/CoinChooseForm.cs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants