summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwenji <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com>2008-04-09 21:43:32 -0400
committerwenji <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com>2008-04-09 21:43:32 -0400
commitf317d3a33bdf4962b0655861e4552b5fec0f0a37 (patch)
treef08c604f40e87167e96c995d7ebff12c45333446
parent34fc1cc81a47fbb3f712a70a2acdb533e2a99090 (diff)
parenta291e87b97bd7eefcd63cc63f37c14ccdae1a268 (diff)
downloadsystemtap-steved-f317d3a33bdf4962b0655861e4552b5fec0f0a37.tar.gz
systemtap-steved-f317d3a33bdf4962b0655861e4552b5fec0f0a37.tar.xz
systemtap-steved-f317d3a33bdf4962b0655861e4552b5fec0f0a37.zip
Merge branch 'master' of ssh://wenji@sources.redhat.com/git/systemtap
-rw-r--r--.gitignore2
-rw-r--r--ChangeLog4
-rw-r--r--doc/.gitignore8
-rw-r--r--doc/ChangeLog4
4 files changed, 18 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 69bd5e97..4984fad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ systemtap.spec
testresults
stapio
stap_merge
+SNAPSHOT
+*.o
diff --git a/ChangeLog b/ChangeLog
index e35d90b6..7d2853d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-09 David Smith <dsmith@redhat.com>
+
+ * .gitignore: Added more files to ignore.
+
2008-04-04 Masami Hiramatsu <mhiramat@redhat.com>
PR 6028
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..d8a93302
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,8 @@
+*.aux
+*.glo
+*.idx
+*.log
+*.lot
+*.out
+*.pdf
+*.toc
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e652078d..21b3cbf7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-09 David Smith <dsmith@redhat.com>
+
+ * .gitignore: New file.
+
2008-03-25 Frank Ch. Eigler <fche@elastic.org>
* langref.tex: Clarify utility of epilogue-type probe aliases.