SparkleShare/SparkleLib/Git
wimh cad52d7072 Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles
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
2011-10-02 01:57:14 +02:00
..
SparkleFetcherGit.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleRepoGit.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00