Commit graph

8 commits

Author SHA1 Message Date
wimh 8959c060ee convert to vs2010, fix about dialog background 2011-07-19 23:54:07 +02:00
wimh 4150ed7845 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 7bf7059b32 change platform to x86 because gtk# does not support x64 2011-07-02 10:24:33 +02:00
wimh 698a057104 fix compile problem on windows x64 2011-06-29 16:28:00 +02:00
wimh f0cdc89f46 C:\msysgit\msysgit -> C:\msysgit, see also 7631edc6f9 2011-06-27 18:04:28 +02:00
wimh d01512b910 fix merge issues 2011-06-23 22:05:09 +02:00
wimh 7d0c9d6262 windows: locate texttransform.exe 2011-06-18 23:45:30 +02:00
wimh c16623715c reset to upstream/master, add windows files and fixes 2011-06-11 21:52:41 +02:00