SparkleShare/SparkleLib/windows
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
..
AssemblyInfo.cs reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00
Defines.tt reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00
getversion.tt C:\msysgit\msysgit -> C:\msysgit, see also 7631edc6f9 2011-06-27 18:04:28 +02:00
GlobalAssemblyInfo.tt reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00
SparkleLib.csproj Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles 2011-10-02 01:57:14 +02:00
transform_tt.cmd add and integrate submodule TextTemplating (TextTransform.exe) in build 2011-08-13 01:33:15 +02:00