Merge with trunk

This commit is contained in:
andreyskv
2010-10-04 21:51:45 -07:00
20 changed files with 133 additions and 49 deletions

View File

@@ -37,7 +37,6 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener {
protected:
bool showInfo;
Glib::ustring infotext;
Glib::RefPtr<Pango::Layout> ilayout;
Glib::RefPtr<Pango::Layout> deglayout;