From da5c9b06fe0081050ab8165cf3d189dbc8117bf6 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Tue, 04 Nov 2003 16:41:07 +0000
Subject: resolved merge conflict

---
(limited to 'libopie2/opieui/opiemenubar.h')

--
cgit v0.9.0.2