diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 10:08:48 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 10:08:48 -0700 |
| commit | 01055fb54f717b811474592a22d82ba66a4f1865 (patch) | |
| tree | 9b48e51a67fce1a9f47afbbcee5c8bcf12291f4b | |
| parent | 76a7ad3161be0994d7ba98e9dff9b317b2430bb3 (diff) | |
| parent | 563a25f559a0247b2e3f4e96b191e7138c8e8ea5 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.build_number b/.build_number index 0c634ab7..1da57b8b 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=106 +build_number=108 diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index d19392cf..8d8853b0 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -316,7 +316,7 @@ class graphics_Core { // ImageMagick & GraphicsMagick $magick_kits = array( "imagemagick" => array( - "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v", + "name" => "ImageMagick", "binary" => "convert", "version" => "convert -version", "version_regex" => "/Version: \S+ (\S+)/"), "graphicsmagick" => array( "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version", |