Tim Sutton 5f79bcb16f Resolved merge conflicts with origin master

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

..

composer

Resolved merge conflicts with origin master

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

diagram

SIP bindings update:

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

gps

SIP bindings update:

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

raster

SIP bindings update:

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

renderer

SIP bindings update:

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

symbology

SIP bindings update:

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

symbology-ng

SIP bindings update:

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

conversions.sip

fix python binding for QgsVectorDataProvider::changeGeometryValues()

2012-01-27 00:24:24 +01:00

core.sip

SIP bindings update:

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

qgis.sip

SIP bindings update:

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

qgsapplication.sip

SIP bindings update:

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

qgsattributeaction.sip

SIP bindings update:

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

qgsbrowsermodel.sip

SIP bindings update:

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

qgsclipper.sip

SIP bindings update:

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

qgscontexthelp.sip

SIP bindings update:

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

qgscoordinatereferencesystem.sip

SIP bindings update:

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

qgscoordinatetransform.sip

SIP bindings update:

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

qgscredentials.sip

SIP bindings update:

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

qgscrscache.sip

SIP bindings update:

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

qgsdataitem.sip

SIP bindings update:

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

qgsdataprovider.sip

SIP bindings update:

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

qgsdatasourceuri.sip

SIP bindings update:

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

qgsdbfilterproxymodel.sip

SIP bindings update:

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

qgsdiagramrendererv2.sip

SIP bindings update:

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

qgsdistancearea.sip

SIP bindings update:

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

qgsexception.sip

fix #4941

2012-02-04 10:11:22 +01:00

qgsexpression.sip

SIP bindings update:

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

qgsfeature.sip

SIP bindings update:

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

qgsfield.sip

SIP bindings update:

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

qgsgeometry.sip

SIP bindings update:

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

qgsgeometryvalidator.sip

SIP bindings update:

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

qgshttptransaction.sip

SIP bindings update:

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

qgslabel.sip

SIP bindings update:

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

qgslabelattributes.sip

SIP bindings update:

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

qgslabelsearchtree.sip

SIP bindings update:

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

qgslogger.sip

SIP bindings update:

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

qgsmaplayer.sip

SIP bindings update:

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

qgsmaplayerregistry.sip

SIP bindings update:

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

qgsmaprenderer.sip

SIP bindings update:

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

qgsmaptopixel.sip

SIP bindings update:

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

qgsmessagelog.sip

SIP bindings update:

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

qgsmessageoutput.sip

SIP bindings update:

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

qgsmimedatautils.sip

SIP bindings update:

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

qgsnetworkaccessmanager.sip

SIP bindings update:

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

qgsoverlayobject.sip

SIP bindings update:

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

qgsoverlayobjectpositionmanager.sip

SIP bindings update:

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

qgsowsconnection.sip

SIP bindings update:

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

qgspaintenginehack.sip

SIP bindings update:

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

qgspalgeometry.sip

SIP bindings update:

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

qgspallabeling.sip

SIP bindings update:

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

qgspluginlayer.sip

SIP bindings update:

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

qgspluginlayerregistry.sip

SIP bindings update:

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

qgspoint.sip

SIP bindings update:

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

qgsproject.sip

SIP bindings update:

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

qgsprojectproperty.sip

SIP bindings update:

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

qgsprojectversion.sip

SIP bindings update:

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

qgsprovidercountcalcevent.sip

SIP bindings update:

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

qgsproviderextentcalcevent.sip

SIP bindings update:

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

qgsprovidermetadata.sip

SIP bindings update:

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

qgsproviderregistry.sip

SIP bindings update:

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

qgspythonrunner.sip

SIP bindings update:

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

qgsrasterdataprovider.sip

SIP bindings update:

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

qgsrasterprojector.sip

SIP bindings update:

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

qgsrectangle.sip

SIP bindings update:

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

qgsrenderchecker.sip

SIP bindings update:

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

qgsrendercontext.sip

SIP bindings update:

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

qgsrunprocess.sip

SIP bindings update:

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

qgsscalecalculator.sip

SIP bindings update:

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

qgsscaleutils.sip

SIP bindings update:

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

qgssnapper.sip

SIP bindings update:

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

qgsspatialindex.sip

SIP bindings update:

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

qgstolerance.sip

SIP bindings update:

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

qgsvectordataprovider.sip

SIP bindings update:

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

qgsvectorfilewriter.sip

SIP bindings update:

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

qgsvectorlayer.sip

SIP bindings update:

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

qgsvectorlayerimport.sip

SIP bindings update:

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

qgsvectorlayerjoinbuffer.sip

SIP bindings update:

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

qgsvectorlayerundocommand.sip

SIP bindings update:

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

qgsvectoroverlay.sip

SIP bindings update:

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