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 |
||
---|---|---|
.. | ||
html | ||
icons | ||
src | ||
about.png | ||
Makefile.am | ||
side-splash.png | ||
sparkleshare-mac.icns | ||
sparkleshare.icns | ||
tutorial-slide-1.png | ||
tutorial-slide-2.png | ||
tutorial-slide-3.png | ||
tutorial-slide-4.png |