b98c4ee5fb
Conflicts: .gitignore .gitmodules SparkleLib/Git/SparkleFetcherGit.cs SparkleLib/Hg/SparkleRepoHg.cs SparkleLib/SparkleConfig.cs SparkleLib/SparkleFetcherBase.cs SparkleLib/SparkleListenerIrc.cs SparkleShare/SparkleBubblesController.cs SparkleShare/SparkleControllerBase.cs SparkleShare/SparkleStatusIcon.cs |
||
---|---|---|
.. | ||
git-hooks | ||
html | ||
icons | ||
plugins | ||
src | ||
about.png | ||
Makefile.am | ||
side-splash.png | ||
sparkleshare-mac.icns | ||
sparkleshare.icns | ||
tutorial-slide-1-mac.png | ||
tutorial-slide-1.png | ||
tutorial-slide-2-mac.png | ||
tutorial-slide-2.png | ||
tutorial-slide-3-mac.png | ||
tutorial-slide-3.png | ||
tutorial-slide-4.png |