summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore18
-rw-r--r--ChangeLog8
2 files changed, 18 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index dc1bf3f11b..bda55a3839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,16 @@
*.rej
*~
-*.a
+.#*
+*#
+
*.flt
-*.gdb
*.gmo
*.info
*.la
*.lo
*.o
+*.pyc
*.tmp
.deps
@@ -24,17 +26,17 @@ config.intl
config.log
config.status
libtool
-Makefile
-stamp-*
POTFILES
*-POTFILES
-*/po/Makefile.in
+
+TAGS
+TAGS.sub
.gdbinit
.gdb_history
+
+# ignore core files, but not java/net/protocol/core/
core
+!core/
lost+found
-
-*.log
-*.sum
diff --git a/ChangeLog b/ChangeLog
index e285ca9f24..7b58688387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-11 Joel Brobecker <brobecker@adacore.com>
+
+ Sync with GCC, merge:
+
+ 2013-01-09 Jason Merrill <jason@redhat.com>
+
+ * .gitignore: Import from gdb repository.
+
2013-01-11 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config.sub: Update from config repo.