From: Ben Pfaff <blp@gnu.org>
Date: Mon, 8 Feb 2010 04:22:31 +0000 (-0800)
Subject: Merge "output" into "master"
X-Git-Tag: v0.7.4~15
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp-builds.git

Merge "output" into "master"
---

d0b91eae59319ab2756d0d43b9cb15eb9cd3c234
diff --cc .gitignore
index 56d869b2,f8c59fe0..c24b805a
--- a/.gitignore
+++ b/.gitignore
@@@ -39,4 -39,5 +39,6 @@@ gitlog-to-changelo
  *.deps
  *.la
  *.libs
+ /arg-nonnull.h
 +/package.m4
+ /unused-parameter.h
diff --cc src/language/stats/factor.c
index 29e30c16,cfec4a9a..58d5b868
--- a/src/language/stats/factor.c
+++ b/src/language/stats/factor.c
@@@ -1,5 -1,5 +1,5 @@@
  /* PSPP - a program for statistical analysis.
--   Copyright (C) 2009 Free Software Foundation, Inc.
++   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --cc src/ui/gui/automake.mk
index cb730ec2,0a827a3a..a9b6f212
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@@ -59,8 -58,10 +59,9 @@@ UI_FILES = 
  	src/ui/gui/crosstabs.ui \
  	src/ui/gui/descriptives.ui \
  	src/ui/gui/examine.ui \
+ 	src/ui/gui/factor.ui \
  	src/ui/gui/find.ui \
  	src/ui/gui/frequencies.ui \
 -	src/ui/gui/message-dialog.ui \
  	src/ui/gui/oneway.ui \
  	src/ui/gui/psppire.ui \
  	src/ui/gui/rank.ui \