projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c2bd172
)
remove conflict indicators
author
Christian Schaller
<uraeus@gnome.org>
Sun, 7 Mar 2004 11:26:27 +0000
(11:26 +0000)
committer
Christian Schaller
<uraeus@gnome.org>
Sun, 7 Mar 2004 11:26:27 +0000
(11:26 +0000)
Original commit message from CVS:
remove conflict indicators
ChangeLog
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 70672128036f25f6909d4f7ca740561f5dfa6877..56f0e42001b6314d057d4621d25bdd1d1efa694e 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-116,7
+116,6
@@
make sure to handle the case where there's no current chain
gracefully.
->>>>>>> 1.392
2004-03-05 David Schleef <ds@schleef.org>
* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):