Merge branch 'master' of https://github.com/hholtmann/smcFanControl

Browse Source

Conflicts:
	smcFanControl.xcodeproj/project.pbxproj

...

This commit is contained in:

Hendrik Holtmann

2014-10-20 16:41:03 +02:00

parent bb9eb56faf 47c1d38d4c

commit ee8f96e45f

4 changed files with 107 additions and 127 deletions

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

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

BIN

smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate generated

Binary file not shown.