From 1fed961e25a6afd4070d8873b431aba8342406c3 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Mon, 27 Oct 2003 20:26:56 +0000
Subject: merge noncore/multimedia/showimg

 - opieplayer2 and opierec generate lots of conflicts in merge
   I'll gladly leave that to the experts ljp and Harlekin ;)
---
(limited to 'noncore/apps/opie-console')

--
cgit v0.9.0.2