From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 1 Dec 2008 09:35:16 +0000 (+0900)
Subject: Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite... 
X-Git-Tag: v0.7.1~91
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=912ff5beae407cded83c9e389a2fd3c9166fd2c0

Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet

Conflicts:

	src/ui/gui/psppire-var-store.h
---

912ff5beae407cded83c9e389a2fd3c9166fd2c0
diff --cc src/ui/gui/psppire-var-store.h
index 7ef186a0,160812ca..cf437589
--- a/src/ui/gui/psppire-var-store.h
+++ b/src/ui/gui/psppire-var-store.h
@@@ -65,7 -65,7 +65,6 @@@ struct _PsppireVarStor
    /*< private >*/
    PsppireDict *dict;
    GdkColor disabled;
-   const PangoFontDescription *font_desc;
 -  gint trailing_rows;
    PsppireVarStoreFormatType format_type;
  };