SparkleShare/SparkleLib/Git
wimh 4150ed7845 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	.gitignore
	SparkleShare/SparkleIntro.cs
	SparkleShare/SparkleShare.cs
	SparkleShare/SparkleUI.cs
2011-07-19 23:20:21 +02:00
..
SparkleFetcherGit.cs Project Evil: allow SparkleShare to take full http(s) URIs without choking. 2011-06-30 12:53:05 +01:00
SparkleRepoGit.cs Merge remote-tracking branch 'upstream/master' into windows 2011-07-19 23:20:21 +02:00