summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2008-06-11 20:01:15 +0000
committerJosé Alburquerque <jaalburqu@src.gnome.org>2008-06-11 20:01:15 +0000
commitb94eb5a9425033a402953a77b5dbb49d39b33f99 (patch)
tree3b20e0b9ace1dcdb9d199f06acf50e270dfc54e0
parent1ade09ec777f835804ba93427327b50aaf5b1cb0 (diff)
downloadglibmm-b94eb5a9425033a402953a77b5dbb49d39b33f99.tar.gz
Contents of files in tests/glibmm_date/ (main.cc and Makefile.am) were
2008-06-11 José Alburquerque <jaalburqu@svn.gnome.org> * tests/glibmm_date/Makefile.am: Contents of files in tests/glibmm_date/ (main.cc and Makefile.am) were duplicated when I applied patch in bug #536721 to already existing files before 6/9 commit. Fixed main.cc already, so now repaired Makefile.am. svn path=/trunk/; revision=663
-rw-r--r--ChangeLog7
-rw-r--r--tests/glibmm_date/Makefile.am10
2 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d112f3d9..376e865e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-11 José Alburquerque <jaalburqu@svn.gnome.org>
+
+ * tests/glibmm_date/Makefile.am: Contents of files in
+ tests/glibmm_date/ (main.cc and Makefile.am) were duplicated when I
+ applied patch in bug #536721 to already existing files before 6/9
+ commit. Fixed main.cc already, so now repaired Makefile.am.
+
2008-06-10 José Alburquerque <jaalburqu@svn.gnome.org>
* tests/glibmm_date/main.cc: Removed duplicate code so test can
diff --git a/tests/glibmm_date/Makefile.am b/tests/glibmm_date/Makefile.am
index 87de32bf..6cd6fff6 100644
--- a/tests/glibmm_date/Makefile.am
+++ b/tests/glibmm_date/Makefile.am
@@ -2,13 +2,3 @@ include $(top_srcdir)/tests/Makefile.am_fragment
noinst_PROGRAMS = test
test_SOURCES = main.cc
-
-
-
-include $(top_srcdir)/tests/Makefile.am_fragment
-
-noinst_PROGRAMS = test
-test_SOURCES = main.cc
-
-
-