[QGIS Commit] [qgis/Quantum-GIS] c836d6: fix merge mistake

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: c836d61e99f7390c0cc1211be50b2eb0bc35f78f
      https://github.com/qgis/Quantum-GIS/commit/c836d61e99f7390c0cc1211be50b2eb0bc35f78f
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M src/gui/qgsrasterlayersaveasdialog.cpp
    M src/gui/qgsrasterlayersaveasdialog.h

  Log Message:
  -----------
  fix merge mistake