Merge branch 'master' into htmlfix

[phpfspot.git] / phpfspot_cfg.php.dist

diff --git a/phpfspot_cfg.php.dist b/phpfspot_cfg.php.dist
index c792d062ba29ee645e998922da4e27e91a552019..3793c541414d7da39735a62937a24e3a4090a2fa 100644 (file)
--- a/phpfspot_cfg.php.dist
+++ b/phpfspot_cfg.php.dist
@@ -116,8 +116,8 @@ class PHPFSPOT_CFG {
    /* path to dcraw to decode Nikon's NEF format */
    // var $dcraw_bin = "/usr/bin/dcraw";
 
-   /* path to cjpeg to create JPEG from dcraw's PPM output */
-   // var $cjpeg_bin = "/usr/bin/cjpeg";
+   /* user friendly URLs */
+   var $user_friendly_url = false;
 
    public function __construct()
    {