Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

Conflicts: lib/boinc_win.h
2014-04-29 08:02:31 -07:00 · 2014-04-29 08:02:31 -07:00 · 6f463af707
parent c6995ce06b e9d5a08eda
commit 6f463af707
1 changed files with 0 additions and 1 deletions
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@ -193,7 +193,6 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
 #endif


-
 #ifdef __cplusplus
 #include <algorithm>
 #include <cassert>