SparkleShare/SparkleLib
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
..
Git Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
Hg Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
windows Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
AssemblyInfo.cs.in setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Defines.cs.in setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
Makefile.am Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleBackend.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleChangeSet.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleConfig.cs Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
SparkleFetcherBase.cs Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
SparkleHelpers.cs setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
SparkleLib.csproj setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
SparkleLib.sln setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
SparkleListenerBase.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleListenerIrc.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleListenerTcp.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleOptions.cs setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00
SparklePath.cs Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
SparkleRepoBase.cs Merge with upstream (11a932b73e) 2011-10-02 00:52:21 +02:00
SparkleWatcher.cs setup: add images to tutorial pages 2011-09-14 02:09:03 +02:00