summaryrefslogtreecommitdiff
path: root/core
authorwaspe <waspe>2003-11-03 17:55:02 (UTC)
committer waspe <waspe>2003-11-03 17:55:02 (UTC)
commit6d7e3e8b04b63d92c61d1109c35163690f2c9948 (patch) (side-by-side diff)
tree0b21b31e2ce6df2639469bc2b75d625203a2c298 /core
parentea385e81e3de3ee100a5789a8a8d1b807d89efe0 (diff)
downloadopie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.zip
opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.gz
opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.bz2
reolved merge conflict
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp3
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 @@
// copyright 2002 Jeremy Cowgar <jc@cowgar.com>
/*
* $Id$
- */
+*/
// copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com>
extern "C" {
@@ -27,7 +27,6 @@ extern "C" {
#include <errno.h>
-
typedef struct _waveheader {
u_long main_chunk; /* 'RIFF' */
u_long length; /* filelen */