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

Browse Source

Conflicts:
	client/hostinfo_win.cpp

...

This commit is contained in:

David Anderson 2014-11-25 15:43:13 -08:00

parent 29630fc5ac 88b7e0d39e

commit 1866447cd0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available