Hugo Mercier b5f736ad21 Revert "Resolved merge conflicts when reverting 686f632" ...

This reverts commit a654e274a352ef29354de0bcb13e96444868c806.

2012-10-04 11:19:04 +02:00

..

qgsaddremoveitemcommand.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgsaddremovemultiframecommand.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerarrow.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerattributetable.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerframe.sip

Resolved merge conflicts with origin master

2012-09-24 10:03:06 +02:00

qgscomposerhtml.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposeritem.sip

fix doxygen warnings

2012-09-25 21:29:32 +02:00

qgscomposeritemcommand.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposeritemgroup.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerlabel.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerlegend.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerlegenditem.sip

more sip fixes

2012-09-26 18:46:52 +02:00

qgscomposermap.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposermultiframe.sip

Resolved merge conflicts with origin master

2012-09-24 10:03:06 +02:00

qgscomposermultiframecommand.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerpicture.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposerscalebar.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposershape.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposertable.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposertexttable.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgscomposition.sip

Revert "Resolved merge conflicts when reverting 686f632"

2012-10-04 11:19:04 +02:00

qgsdoubleboxscalebarstyle.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgslegendmodel.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgsnumericscalebarstyle.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgspaperitem.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgsscalebarstyle.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgssingleboxscalebarstyle.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00

qgsticksscalebarstyle.sip

SIP bindings update:

2012-09-24 02:42:57 +02:00