Commit graph

4 commits

Author SHA1 Message Date
wimh e11ba04bfb Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	.gitignore
	SparkleShare/SparkleIntro.cs
	SparkleShare/SparkleShare.cs
	SparkleShare/SparkleUI.cs
2011-07-19 23:20:21 +02:00
wimh 0079c209d0 change platform to x86 because gtk# does not support x64 2011-07-02 10:24:33 +02:00
wimh d541f2179f fix merge issues 2011-06-23 22:05:09 +02:00
wimh 5501a448b5 reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00