From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 8 Apr 2009 01:14:57 +0000 (+0800)
Subject: Merge commit 'origin/master' into charset
X-Git-Tag: v0.7.3~176
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=537fdeb3702c011e05d7826a8d556a7beeba2605

Merge commit 'origin/master' into charset

Conflicts:

	src/ui/gui/psppire-data-editor.c
---

537fdeb3702c011e05d7826a8d556a7beeba2605
diff --cc src/ui/gui/psppire-data-editor.c
index 1070f5c2,be911ba6..9d15ceb9
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@@ -23,8 -23,7 +23,8 @@@
  
  #include <language/syntax-string-source.h>
  #include "psppire-data-store.h"
- #include <ui/gui/sheet/psppire-axis-impl.h>
 +#include <libpspp/i18n.h>
+ #include <ui/gui/sheet/psppire-axis.h>
  #include "helper.h"
  
  #include <gtk-contrib/gtkxpaned.h>