[gimp/soc-2013-combined-selection-tool: 230/230] merge conflicts

[Ajay Ramanathan <ajayr src gnome org>]

commit ca52dd73926abe6d4e82e6d10f70a11a929ea502
Merge: 61fde49 6e1ba8a
Author: Ajay Ramanathan <ajay 010293 gmail com>
Date:   Sat Sep 21 08:38:02 2013 +0530

    merge conflicts

 devel-docs/app/app-sections.txt         |    3 +++
 devel-docs/libgimp/libgimp-sections.txt |    3 +++
 tools/pdbgen/enums.pl                   |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc tools/pdbgen/enums.pl
index cd4f1b4,c91951e..a8b7646
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@@ -427,18 -427,6 +427,21 @@@ package Gimp::CodeGen::enums
                       GIMP_SHAPE_N_POLYGON => '3',
                       GIMP_SHAPE_SINGLE_ROW => '4' }
        },
++<<<<<<< HEAD
 +    GimpComponentType =>
 +      { contig => 0,
 +        header => 'core/core-enums.h',
 +        symbols => [ qw(GIMP_COMPONENT_TYPE_U8 GIMP_COMPONENT_TYPE_U16
 +                        GIMP_COMPONENT_TYPE_U32 GIMP_COMPONENT_TYPE_HALF
 +                        GIMP_COMPONENT_TYPE_FLOAT) ],
 +        mapping => { GIMP_COMPONENT_TYPE_U8 => '100',
 +                     GIMP_COMPONENT_TYPE_U16 => '200',
 +                     GIMP_COMPONENT_TYPE_U32 => '300',
 +                     GIMP_COMPONENT_TYPE_HALF => '400',
 +                     GIMP_COMPONENT_TYPE_FLOAT => '500' }
 +      },
++=======
++>>>>>>> 6e1ba8af48bac3f951ab71ff3a73ad57634fad3f
      GimpConvertDitherType =>
        { contig => 1,
          header => 'core/core-enums.h',