Hylke Bons d654f9dc82 repo git: Solve conflicts by merging, instead of rebasing. Fixes #1106		2013-12-02 20:52:17 +00:00
..
Makefile.am	build: move version number definition to central place, clean up build tools	2012-07-26 15:17:35 +02:00
SparkleFetcherGit.cs	Relicense SparkleLib to LGPL	2013-10-11 17:14:15 +02:00
SparkleGit.cs	git linux: Check user's local bin folder for possibly newer git version. Closes #1425	2013-11-12 23:05:43 +00:00
SparkleLib.Git.csproj	crypto: use a random salt per repo, store it as a remote branch name	2012-09-29 23:57:35 +02:00
SparkleRepoGit.cs	repo git: Solve conflicts by merging, instead of rebasing. Fixes #1106	2013-12-02 20:52:17 +00:00