diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 11:46:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 11:46:39 -0700 |
| commit | 550eb862fa6dbc1d07c6a3165634900421dd2ca6 (patch) | |
| tree | eca4668dfe8c8fe18a4ecd3128392789cd0ca432 /parse-xml.c | |
| parent | 09174367294c399265954a9e2770427e5ee251ba (diff) | |
| parent | f12382c66f2b3deddf38f7d51fda3a2c75a0c5fa (diff) | |
| download | subsurface-550eb862fa6dbc1d07c6a3165634900421dd2ca6.tar.gz | |
Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog
* 'compiler-warning' of https://github.com/nathansamson/diveclog:
Removed the unused startemp and enttemp calculations. This fixes a compiler warning too.
Fix up trivial conflict in dive.c due to the temperature simplification
(commit 9961c7f89ce6: "Remove redundant temperature readings").
Diffstat (limited to 'parse-xml.c')
0 files changed, 0 insertions, 0 deletions