From dc96afa26288897a9d25ab8c321d8ad350c53f44 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Tue, 04 Nov 2003 17:08:12 +0000
Subject: resolved merge conflict

---
(limited to 'library/imageedit.cpp')

--
cgit v0.9.0.2