wimh
|
5aece32778
|
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 |
|
|
wimh
|
636efe9011
|
Merge with upstream (11a932b73e)
|
2011-10-02 00:52:21 +02:00 |
|
|
wimh
|
cf62d23753
|
set PlatformTarget from AnyCPU to x86
CefSharp is win32 only:
https://github.com/chillitom/CefSharp/blob/master/CefSharp/CefSharp.vcproj#L11
|
2011-08-28 21:49:04 +02:00 |
|
|
wimh
|
30e5edf562
|
set PlatformTarget from x86 to AnyCPU
|
2011-08-13 22:33:48 +02:00 |
|
|
wimh
|
bd5001f233
|
add and integrate submodule TextTemplating (TextTransform.exe) in build
|
2011-08-13 01:33:15 +02:00 |
|
|
wimh
|
82162b447c
|
remove references to gtksharp and mono when compiled under .net
|
2011-08-07 00:26:23 +02:00 |
|
|
wimh
|
48ed8dcd88
|
revert to vs2008
|
2011-07-21 18:20:20 +02:00 |
|
|
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 |
|