removed conflict markers from ChangeLog, updated NEWS

This commit is contained in:
Sven Neumann 2002-03-18 17:53:23 +00:00
parent fe96c95524
commit 11f7e6fe17
2 changed files with 14 additions and 2 deletions

View File

@ -590,7 +590,6 @@
* libgimp/gimppalette_pdb.[ch]
* libgimp/gimppatterns_pdb.c: regenerated.
>>>>>>> 1.4218
2002-03-11 Sven Neumann <sven@gimp.org>
* app/gui/preferences-dialog.c: use a PangoAttributeList instead of

15
NEWS
View File

@ -1,3 +1,4 @@
The GNU Image Manipulation Program Version 1.3
A Colorspace Odyssey
@ -8,7 +9,19 @@ dubbed GIMP 1.4.
Overview of Changes in GIMP 1.3.5
=================================
- Made tool options dockable [Mitch]
- Improved tool options and made them dockable [Mitch]
- Added a DTD for gimp-tips.xml [Sven]
- Cleanup of brush, gradient, pattern and palette PDB functions [Mitch]
- Autogenerate libgimp/gimp_pdb.h [Yosh]
- Converted the toolbox to a dock [Mitch]
- Resurrected display filter modules [Mitch]
- Plug-in code cleanup (colorify) [Maurits Rijk]
- New menu icons [Jimmac, Mitch]
- New GimpEnumMenu widget [Sven]
- Enum cleanup [Yosh, Sven]
Other Contributors:
Rebecca Walter, Tuomas Kuosmanen
Overview of Changes in GIMP 1.3.4