projects
/
claws.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
afab328
)
remove conflict marker...
author
Alfons Hoogervorst
<alfons@proteus.demon.nl>
Mon, 9 Jul 2001 16:22:16 +0000
(16:22 +0000)
committer
Alfons Hoogervorst
<alfons@proteus.demon.nl>
Mon, 9 Jul 2001 16:22:16 +0000
(16:22 +0000)
ChangeLog.claws
patch
|
blob
|
history
diff --git
a/ChangeLog.claws
b/ChangeLog.claws
index eaddde59019ca42165007eafc38a2cbaab459d54..d780108902ce8de0b5fdfc5f17e14e6a66927ab0 100644
(file)
--- a/
ChangeLog.claws
+++ b/
ChangeLog.claws
@@
-25,7
+25,6
@@
* src/scoring.c
bugfix of the config file parser
->>>>>>> 1.205
2001-07-08 [alfons]
* src/Makefile.am