From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 10 Nov 2007 04:12:02 +0000 (+0000)
Subject: Made ion3 and particleman replace and conflict with each other; similarly for ion3... 
X-Git-Tag: 20080103-1~9
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=78a74b3b5846eacaecea5045d1cd185e9c8e21d7;hp=78a74b3b5846eacaecea5045d1cd185e9c8e21d7;p=ion3.git

Made ion3 and particleman replace and conflict with each other; similarly for ion3-dev and particleman-dev.
Removed obsolete conflicts.
---