Conflicts: SparkleLib/Git/SparkleRepoGit.cs SparkleLib/SparkleListenerIrc.cs SparkleShare/Program.cs SparkleShare/SparkleControllerBase.cs SparkleShare/SparkleExtensions.cs SparkleShare/SparkleLinController.cs SparkleShare/SparkleStatusIcon.cs SparkleShare/SparkleUI.cs |
||
---|---|---|
.. | ||
SparkleFetcherGit.cs | ||
SparkleRepoGit.cs |