Merge branch 'master' of github.com:Chronic-Dev/animate

Conflicts: control
Chronic-Dev · Jul 11, 2011 · 468ba5a · 468ba5a
2 parents 879eb70 + ca4e9e0
commit 468ba5a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/control b/control
@@ -1,5 +1,6 @@
 Package: org.chronic-dev.animate
 Depends: preferenceloader
+Conflicts: imagemagick
 Name: BootLogo
 Version: 1.0.1
 Installed-Size: 204