diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-06 15:17:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-06 15:17:24 -0700 |
| commit | dbfce3035ef1499e47607a84b3ed07ccc95abd70 (patch) | |
| tree | 07e83d42ab660a80f1d4aab44aa8d427c9341307 /display.h | |
| parent | b6590150d68df528efd40c889ba6eea476b39873 (diff) | |
| parent | dfe5133b579d1ee999080de68041d0009aa4b5d5 (diff) | |
| download | subsurface-dbfce3035ef1499e47607a84b3ed07ccc95abd70.tar.gz | |
Merge branch 'dirk'
* dirk:
Print starting and ending pressures
Fix up conflicts in profile.c due to different ways to set the text
formatting. Dirk's 'text_format_options' thing is prettier than mine.
Use it.
Diffstat (limited to 'display.h')
0 files changed, 0 insertions, 0 deletions