| author | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
| commit | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (patch) (unidiff) | |
| tree | 0b21b31e2ce6df2639469bc2b75d625203a2c298 | |
| parent | ea385e81e3de3ee100a5789a8a8d1b807d89efe0 (diff) | |
| download | opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.zip opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.gz opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.bz2 | |
reolved merge conflict
| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 6ec4583..83c148f 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> | 12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> |
| 13 | /* | 13 | /* |
| 14 | * $Id$ | 14 | * $Id$ |
| 15 | */ | 15 | */ |
| 16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> | 16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> |
| 17 | 17 | ||
| 18 | extern "C" { | 18 | extern "C" { |
| @@ -27,7 +27,6 @@ extern "C" { | |||
| 27 | 27 | ||
| 28 | #include <errno.h> | 28 | #include <errno.h> |
| 29 | 29 | ||
| 30 | |||
| 31 | typedef struct _waveheader { | 30 | typedef struct _waveheader { |
| 32 | u_long main_chunk; /* 'RIFF' */ | 31 | u_long main_chunk; /* 'RIFF' */ |
| 33 | u_long length; /* filelen */ | 32 | u_long length; /* filelen */ |