Permalink
Browse files

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

Conflicts:
	control
  • Loading branch information...
2 parents 879eb70 + ca4e9e0 commit 468ba5a97d012c1ae7797ace6260edfa2904ac41 @Jaywalker Jaywalker committed Jul 11, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 control
View
@@ -1,5 +1,6 @@
Package: org.chronic-dev.animate
Depends: preferenceloader
+Conflicts: imagemagick
Name: BootLogo
Version: 1.0.1
Installed-Size: 204

0 comments on commit 468ba5a

Please sign in to comment.