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

remove conflict chars 

-Yosh
This commit is contained in:
Manish Singh 1999-09-02 01:42:11 +00:00
parent 9fb081a7e6
commit a6b63ca177
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -7,7 +7,8 @@ Wed Sep 1 14:50:29 PDT 1999 Manish Singh <yosh@gimp.org>
* app/Makefile.am: added those files
* app/interface.c: use an hwrapbox for the toolbar
* app/interface.c: use an hwrapbox for the toolbar. Still not perfect
yet, working on it.
* app/gimpdrawable.c
* app/about_dialog.c
@ -60,7 +61,6 @@ Wed Sep 1 23:18:21 BST 1999 Andy Thomas <alt@gimp.org>
the area shown is smaller than the overall image size. Thanks to tml
for the idea.
>>>>>>> 1.1481
Wed Sep 1 22:28:09 BST 1999 Adam D. Moss <adam@gimp.org>
* app/gradient.c