dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missed a CVS conflict indicator

This commit is contained in:
Michael Natterer 1999-03-25 23:19:35 +00:00
parent 737aa1a0de
commit 9b9464963a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -435,7 +435,6 @@ Fri Mar 12 21:30:57 GMT 1999 Andy Thomas <alt@gimp.org>
Thanks to Tan Koan-Sin <freedom@csie.nctu.edu.tw> for pointing Thanks to Tan Koan-Sin <freedom@csie.nctu.edu.tw> for pointing
this out. this out.
>>>>>>> 1.923
Fri Mar 12 22:15:49 CET 1999 Marc Lehmann <pcg@goof.com> Fri Mar 12 22:15:49 CET 1999 Marc Lehmann <pcg@goof.com>
* libgimp/gimp.c: split gimp_quit into two functions, gimp_quit * libgimp/gimp.c: split gimp_quit into two functions, gimp_quit