liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into lockable-color-picker

Browse Source
This commit is contained in:
Hombre
2016-10-07 01:27:33 +02:00
parent 773a65b5be 897b9d92ee
commit 5383a7ab71
13 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtgui/RT.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 125 KiB

2
rtgui/dirbrowser.cc
View File

@@ -59,7 +59,7 @@ std::vector<Glib::ustring> listSubDirs (const Glib::RefPtr<Gio::File>& dir, bool
} catch (const Glib::Exception& exception) {
if (options.rtSettings.verbose) {
std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl;
std::cerr << "Failed to list subdirectories of \"" << dir->get_parse_name() << "\": " << exception.what () << std::endl;
}
}

2
rtgui/dirpyrequalizer.cc
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*
* © 2010 Emil Martinec <ejmartin@uchicago.edu>
* (C) 2010 Emil Martinec <ejmartin@uchicago.edu>
*/
#include "dirpyrequalizer.h"

2
rtgui/dirpyrequalizer.h
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*
* © 2010 Emil Martinec <ejmartin@uchicago.edu>
* (C) 2010 Emil Martinec <ejmartin@uchicago.edu>
*/
#ifndef DIRPYREQUALIZER_H_INCLUDED

2
rtgui/myicon.rc
View File

@@ -1 +1 @@
1 ICON "RT.ico"
1 ICON "../rtdata/icons/RT.ico"