Viewing all changes in revision 7.
- Committer: Iain Lane
- Date: 2010-03-13 18:20:18 UTC
- mfrom: (1.1.2)
- Revision ID: git-v1:1781694a68ecf232d0110c0b2f3d4a1b96c74ec2
Merge commit 'upstream/0.2'
Conflicts:
debian/control
Conflicts:
debian/control
- files added:
- Pinta.Core/Actions/EffectsActions.cs
- Pinta.Gui.Widgets
- Pinta.Gui.Widgets/Dialogs
- Pinta.Gui.Widgets/Widgets
- Pinta.Gui.Widgets/gtk-gui
- Pinta/ConfigurableEffects
- files removed:
- Pinta.Core/Classes/BaseTool.cs
- files modified:
- .gitignore
expand all
collapse all
added
removed
Pinta.Resources/Resources/Menu.Adjustments.Posterize.png
Pinta.Resources/Resources/Menu.Effects.Artistic.InkSketch.png
Pinta.Resources/Resources/Menu.Effects.Artistic.OilPainting.png
Pinta.Resources/Resources/Menu.Effects.Artistic.PencilSketch.png
Pinta.Resources/Resources/Menu.Effects.Blurs.Fragment.png
Pinta.Resources/Resources/Menu.Effects.Blurs.GaussianBlur.png
Pinta.Resources/Resources/Menu.Effects.Blurs.MotionBlur.png
Pinta.Resources/Resources/Menu.Effects.Blurs.RadialBlur.png
Pinta.Resources/Resources/Menu.Effects.Blurs.SurfaceBlur.png
Pinta.Resources/Resources/Menu.Effects.Blurs.Unfocus.png
Pinta.Resources/Resources/Menu.Effects.Blurs.ZoomBlur.png
Pinta.Resources/Resources/Menu.Effects.Photo.Glow.png
