add some more conflicts
authorJesse Luehrs <doy@tozt.net>
Mon, 20 Jun 2011 18:04:39 +0000 (13:04 -0500)
committerJesse Luehrs <doy@tozt.net>
Mon, 20 Jun 2011 18:04:39 +0000 (13:04 -0500)
commit98d17a85cb37a4e469d68350893b6d67e5a37c5d
tree9f9c76db441c5b34e20428e6051c95027f8f4a5d
parentcc51ae70cf8a58661917060240d97591eda03781
add some more conflicts
dist.ini