diff --git a/ChangeLog b/ChangeLog index 0ef808caef71..57b09430e3ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,108315 +1,120171 @@ -2012-06-12 Tim Sutton +Tim Sutton 2013-09-10 - * doc/TRANSLATORS: Manually applied pull request #169 - patch to - update French translator list + Added script to create changelog from http://binarystatic.wordpress.com/2010/02/18/how-to-convert-git-log-to-changelog/ -2012-06-12 Werner Macho +Tim Sutton 2013-09-10 - * doc/TRANSLATORS, i18n/qgis_ko_KR.ts: translation update: ko_KR by - BJ Jang + Put GPL version to 2 instead of 3 in the readme -2012-06-12 Juergen E. Fischer +Tim Sutton 2013-09-10 - * src/gui/attributetable/qgsattributetablemodel.cpp: fix #5523 + Updated news -2012-06-11 Werner Macho +Merge: 641359d f361e11 +Denis Rouzaud 2013-09-10 - * doc/TRANSLATORS, i18n/qgis_et_EE.ts: translation update: et_EE by - Veiko + Merge pull request #741 from 3nids/splitpart + + [Feature] split part of multi-geometry -2012-06-11 Werner Macho +Denis Rouzaud 2013-09-10 - * i18n/qgis_es.ts: translation update: es by Carlos + return the proper error code -2012-06-11 Tim Sutton +Denis Rouzaud 2013-04-22 - * : Merge pull request #171 from Cracert/trans translation update: pl by Robert + split part of multi-geometry -2012-06-11 Tim Sutton +Christian Urich 2013-09-10 - * : Merge pull request #170 from dakcarto/fix-about-hijack Better fix for #5754. More of a hack but works well. + fix #8507 + + made void connectNotify( const char * signal ) protected instead of private + made bool eventFilter( QObject *obj, QEvent *event ) protected instead of private + made void showEvent( QShowEvent * ) and void hideEvent( QHideEvent * ) instead of private -2012-06-11 Werner Macho +Merge: 5f61dd1 b61b5b0 +Larry Shaffer 2013-09-09 - * : Merge pull request #168 from Jean-Roc/master update fr strings + Merge pull request #881 from mbernasocchi/android + + Various android updates from mbernasocchi -2012-06-11 Jean-Roc Morreale +Marco Bernasocchi 2013-09-10 - * i18n/qgis_fr.ts: update fr strings + make honoring -DPYTHON_LIBRARY more solid. + as cmake --help-module FindPythonLibs states + If you'd like to specify the installation of Python to use, you should modify the following cache variables: + + PYTHON_LIBRARY - path to the python library + PYTHON_INCLUDE_PATH - path to where Python.h is found + + (please note it is PYTHON_INCLUDE_PATH (deprecated) and not PYTHON_INCLUDE_DIR (new in 2.8) since we require cmake >= 2.6.2) -2012-06-11 Werner Macho +Marco Bernasocchi 2013-09-10 - * doc/TRANSLATORS, i18n/qgis_pt_BR.ts: translation update: pt_BR by - Arthur + set correct prefixPath() -2012-06-11 Werner Macho +Marco Bernasocchi 2013-09-09 - * scripts/tsstat.pl: remove Henriette from translators + added confirm quit for android -2012-06-11 Werner Macho +Marco Bernasocchi 2013-09-08 - * i18n/qgis_ja.ts: translation update: ja by yoichi + Removed tooltip that shows how many messages are logged on android. + This tooltip was rendered as a fullscreen yellow widget in android. -2012-06-11 Werner Macho +Larry Shaffer 2013-06-26 - * : Merge pull request #167 from artfwo/master Russian translation update for 1.8 + [Android] Fix for Qt Ministro hiding app's menubar in favor of native Android menus + + - Brings back composer window menu bar -2012-06-11 Werner Macho +Larry Shaffer 2013-06-24 - * : Merge pull request #166 from rduivenvoorde/master nl fix + [Android] Fix for Qt Ministro hiding app's menubar in favor of native Android menus + + - Brings back main window menu bar -2012-06-11 pcav +Larry Shaffer 2013-06-23 - * i18n/qgis_it.ts: IT GUI transaltion completed + [Android] Update library path -2012-06-11 Werner Macho +Larry Shaffer 2013-06-23 - * doc/TRANSLATORS, i18n/qgis_af.ts, i18n/qgis_ar.ts, - i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, - i18n/qgis_da_DK.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts, - i18n/qgis_es.ts, i18n/qgis_et_EE.ts, i18n/qgis_fa.ts, - i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_gl_ES.ts, - i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, - i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts, - i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, i18n/qgis_lo.ts, - i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts, - i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, - i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, i18n/qgis_ru.ts, - i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, - i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, i18n/qgis_ta.ts, - i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, - i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation - update: bring all ts files to the same level + [Android] Change order of finding QtMobility package so Qt isn't 'found' twice -2012-06-10 Jürgen Fischer +Marco Bernasocchi 2013-05-19 - * : Merge pull request #165 from dakcarto/fix-menus-two Fixes for issues #5753 and #5754 + worcarounds to make sip generation work on android -2012-06-10 Larry Shaffer +Marco Bernasocchi 2013-05-19 - * src/app/qgisapp.cpp, src/app/qgisapp.h, src/ui/qgisapp.ui: Simple - fix for #5754 (Mac OS-specific). Better fix would be to make a - method that set all QAction additions to base menus (submenus ok) to - QAction::NoRole. This would keep any new action from hijacking the - Mac app's About or Preferences… menus. See: - http://doc.qt.nokia.com/4.7.1/qmenubar.html#qmenubar-on-mac-os-x + less invasive workaround for #7859 -2012-06-10 Nathan Woodrow +Marco Bernasocchi 2013-05-18 - * src/app/composer/qgscomposer.cpp: Fix #5766 + workaround for issue #7859 -2012-06-09 Giuseppe Sucameli +Marco Bernasocchi 2013-05-03 - * python/plugins/db_manager/__init__.py, - python/plugins/db_manager/db_plugins/plugin.py: DBManager: use the - first suitable field loading a view (fix #5676) +#7752 for android sip generation issue fix -2012-06-09 Giuseppe Sucameli +Larry Shaffer 2013-09-09 - * python/plugins/db_manager/dlg_add_geometry_column.py, - python/plugins/db_manager/dlg_create_table.py: DBManager: do not use - translated string for geometry type name (fix #5764) + Fix #8587, show/hide labels tool throws Qt warning -2012-06-09 Giuseppe Sucameli +nyalldawson 2013-09-06 - * src/core/qgsproviderregistry.cpp, - src/providers/postgres/qgspostgresprovider.cpp: delete not valid - provider instances (fix memory leaks), avoid failure due to - assertion calling disconnectDb on PG provider more times + [FEATURE] Add "Lock Selected Items" and "Unlock All" to composer layout menu and toolbar -2012-06-09 Giuseppe Sucameli +Tamas TEVESZ 2013-09-09 - * python/plugins/db_manager/dlg_import_vector.py: DBManager: fix - spatial index creation importing a vector layer (fix #5625) + fix gdb backtrace on FreeBSD -2012-06-09 Gary Sherman +Tim Sutton 2013-09-09 - * : commit 23c0f252e74f615de48bb24c86879e9edf096195 Author: Gary - Sherman Date: Sat Jun 9 07:29:20 2012 -0800 + Bumped version number on splash screen -2012-06-09 Martin Dobias +Salvatore Larosa 2013-09-09 - * src/core/pal/costcalculator.cpp, src/core/pal/feature.cpp, - src/core/pal/pal.cpp: Fix placement of curved labels when there is - just one character + [pyqgis-console] fix undo/redo actions when autocompletion bracket is enabled -2012-06-08 Juergen E. Fischer +Tim Sutton 2013-09-09 - * src/core/composer/qgscomposerarrow.cpp, - src/core/composer/qgscomposeritem.cpp, - src/core/composer/qgscomposerlegend.cpp, - src/core/composer/qgscomposermap.cpp, - src/core/composer/qgscomposerpicture.cpp, - src/core/composer/qgscomposerscalebar.cpp, - src/core/composer/qgscomposershape.cpp, - src/core/composer/qgscomposertable.cpp, - src/core/composer/qgscomposition.cpp, - src/core/qgsdiagramrendererv2.cpp, src/core/qgslabel.cpp, - src/core/qgsmaplayer.cpp, src/core/qgsvectorlayer.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/gui/qgsannotationitem.cpp, src/mapserver/qgswmsserver.cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp: Use QString::number with QDomElement::setAttribute with - double/float (fixes #5749) + Added current sponsor logos to about screen -2012-06-08 Werner Macho +Salvatore Larosa 2013-09-08 - * : Merge pull request #162 from rduivenvoorde/master nl translation fix + [pyqgis-console] fix autocompletion in editor after 6e19748 -2012-06-08 Marco Hugentobler +Juergen E. Fischer 2013-09-08 - * src/providers/wfs/qgswfsprovider.cpp: Try to detect WFS feature - type if not available in describeFeatureType response. Fixes ticket - #5745 + don't use own message handler on android -2012-06-08 Juergen E. Fischer +Juergen E. Fischer 2013-09-08 - * i18n/qgis_de.ts, src/app/qgsmergeattributesdialog.cpp: fix #5758 + indentation update -2012-06-07 Werner Macho +Juergen E. Fischer 2013-09-07 - * doc/TRANSLATORS, i18n/qgis_nl.ts: translation update: nl by - Richard + fix another bunch of warnings -2012-06-07 Juergen E. Fischer +Marco Hugentobler 2013-09-08 - * src/gui/qgsprojectionselector.cpp: fix #5759 + Intendention update -2012-06-07 Tim Sutton +Hugo Mercier 2013-07-11 - * src/plugins/heatmap/heatmapguibase.ui: fix for #5760 - make - heatmap dialog resizeable and use a layout in advanced options + Fix number precision in world file generation -2012-06-07 Alexander Bruy +Hugo Mercier 2013-06-24 - * python/plugins/fTools/__init__.py: fix fTools version to avoid - conflicts with version from Carson's repo + Fiw world file generation (wrong line ordering) -2012-06-07 Radim Blazek +Hugo Mercier 2013-06-14 - * resources/customization.xml: updated widgets / customization + Change computeWorldFileParameters signature and fix Python unit test -2012-06-06 Werner Macho +Hugo Mercier 2013-06-12 - * : Merge pull request #161 from Cracert/trans translation update: pl by Robert + Add unit test for world file generation -2012-06-06 Tim Sutton +Hugo Mercier 2013-06-12 - * python/plugins/plugin_installer/installer_data.py, - python/plugins/plugin_installer/installer_gui.py, - python/plugins/plugin_installer/qgsplugininstallerbase.ui: Apply - patch from Borys to remove 'add 3rd party repos' button in plugin - manager + Add world file generation option. Work funded by Tuscany Region - SITA. Contract Support to the use of GFOSS \(Geographic Free and Open Source Software\) Desktop tools \(CIG Z3B06FA6D7\) -2012-06-06 Werner Macho +Larry Shaffer 2013-09-06 - * doc/TRANSLATORS, i18n/qgis_et_EE.ts: translation update: et_EE by - Veiko + Fix build error, add missing enum to sip file -2012-06-06 Werner Macho +Larry Shaffer 2013-09-06 - * doc/TRANSLATORS, i18n/qgis_nl.ts: translation update: nl by - Richard + Followup to 3b6d4ef, add sip bindings and update console auto-complete file -2012-06-06 Juergen E. Fischer +Larry Shaffer 2013-09-06 - * doc/INSTALL.t2t, doc/msys.t2t: fix some links in INSTALL + Fix Mac error when building qgis_app -2012-06-06 Juergen E. Fischer +Tim Sutton 2013-09-07 - * doc/msvc.t2t: update creatensis section of INSTALL + Applied android fix from Marco B. -2012-06-06 Werner Macho +Juergen E. Fischer 2013-09-06 - * : commit 40fbac0db7e832e0ec8515a0025019d8e345f11b Author: Werner - Macho Date: Wed Jun 6 09:09:08 2012 +0200 + make qgis_app a shared library and fix some more stl warnings with msvc -2012-06-06 Werner Macho +Merge: 609bd69 3896c73 +Tim Sutton 2013-09-06 - * i18n/qgis_nl.ts: translation update: nl by Richard + Merge pull request #871 from slarosa/fix_crash_core_plugins + + Fix crash in core plugins -2012-06-06 Werner Macho +Merge: 721fe27 c2d98e7 +Tim Sutton 2013-09-06 - * i18n/qgis_ja.ts: translation update: ja by yoichi + Merge pull request #870 from etiennesky/browsericons + + use svg icons in browser dock for uI consistency -2012-06-05 Werner Macho +Juergen E. Fischer 2013-09-06 - * : Merge pull request #160 from Cracert/trans translation update: pl by Milena and Robert + german translation update -2012-06-06 Juergen E. Fischer +Juergen E. Fischer 2013-09-06 - * python/core/qgsmaplayerregistry.sip: fix #5747 + fix more warnings (followup 1c9d6ebce) -2012-06-06 Robert Szczepanek +Juergen E. Fischer 2013-09-06 - * i18n/qgis_pl_PL.ts: translation update: pl by Milena and Robert + fix size_t vs. int warnings -2012-06-05 Werner Macho +Juergen E. Fischer 2013-09-06 - * doc/TRANSLATORS, i18n/qgis_pt_BR.ts: translation update: pt_BR by - Arthur + german translation fix (fixes #8580) -2012-06-05 Juergen E. Fischer +Alexander Bruy 2013-09-05 - * INSTALL, doc/msvc.t2t: update osgeo4w dependency list in INSTALL + [processing] write table header only when necessary + adopt Point distance alg to use OutputTable -2012-06-05 pcav +Alexander Bruy 2013-09-05 - * i18n/qgis_it.ts: Fix an error in IT translation + [processing] fix Statistics by categories algorithm -2012-06-04 Gary Sherman +Alexander Bruy 2013-09-05 - * src/providers/ogr/qgsogrprovider.cpp: Fix Ingres driver name so it - is recognized. OGR reports the driver name in title case rather - than all caps currently used in qgsogrprovider.cpp + [processing] use csv module for table writer -2012-06-03 Nathan Woodrow +Victor Olaya 2013-09-06 - * : Merge pull request #159 from szekerest/master MSSQL provider: Implement minimumValue, maximumValue and - uniqueValues + fixed saga installation checking -2012-06-03 Werner Macho +Werner Macho 2013-09-06 - * doc/TRANSLATORS, i18n/qgis_es.ts: translation update: es by Carlos + translation update: nl by richard and es by carlos -2012-06-03 Juergen E. Fischer +Larry Shaffer 2013-09-05 - * doc/TRANSLATORS, i18n/qgis_af.ts, i18n/qgis_ca_ES.ts, - i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_es.ts, - i18n/qgis_gl_ES.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, - i18n/qgis_ja.ts, i18n/qgis_lv.ts, i18n/qgis_nl.ts, - i18n/qgis_pt_BR.ts, i18n/qgis_ru.ts, i18n/qgis_sr_CS-Latn.ts, - i18n/qgis_vi.ts, scripts/tsstat.pl: remove empty translations and - update moved translation + [FEATURE] Add 'Suppress attribute form pop-up after feature creation' option to vector layers; overrides application-wide option -2012-06-03 Werner Macho +Salvatore Larosa 2013-09-06 - * doc/TRANSLATORS, i18n/qgis_nl.ts: forgot to update nl file to - latest strings, TRANSLATORS file also updated + fix crash in Compass plugin -2012-06-03 Werner Macho +Salvatore Larosa 2013-09-06 - * i18n/qgis_ja.ts: translation update: ja by Yoichi + fix crash in GRASS plugin -2012-06-03 Werner Macho +Radim Blazek 2013-09-05 - * i18n/qgis_nl.ts: translation update: nl by Richard + add OS X specific lib to app tests, hopefully fixes #8577 -2012-06-03 Werner Macho +Sandro Santilli 2013-07-29 - * : Merge pull request #158 from Jean-Roc/master update fr strings + Use ST_Force2D for PostGIS 2.1+ -2012-06-02 MORREALE Jean-Roc +Sandro Santilli 2013-05-31 - * : Merge pull request #5 from RCura/master Quelques modifications de traduction + Add field name in layers from postgis relation with multiple spatial fields + + NOTE: only works with browser, not with "Add PostGIS Layer" dialog -2012-06-02 Robin Cura +pcav 2013-09-05 - * i18n/qgis_fr.ts: Some french translations fix Std Dev -> écart type, RGB -> RVB, Natural Breaks (Jenks) -> Seuils - naturels and some minor things. + MInor fixes to IT GUI translation -2012-06-02 Martin Dobias +Denis Rouzaud 2013-06-24 - * python/core/qgsexpression.sip, src/core/qgsexpression.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp: Fixes - for refinement of rules. - quoting of columns (#5536 and #5542) - quoting of string - do not quote of numbers (avoids type cast during evaluation) - use at least 4 floating point digits for doubles + listActions() method for attribute action -2012-06-01 Juergen E. Fischer +Nyall Dawson 2013-05-22 - * src/app/composer/qgscomposer.cpp: fix #5692 + [FEATURE] holding shift while pressing cursor keys results in large movements in composer -2012-06-01 Juergen E. Fischer +Matthias Kuhn 2013-08-30 - * src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: cache sublayer feature counts - and don't retrieve expensive ones (fixes #5322) + Fix spatialite provider for Null QVariant instead of Invalid QVariant -2012-06-01 Werner Macho +Matthias Kuhn 2013-08-02 - * : Merge pull request #157 from artfwo/master Russian translation update for 1.8 + Add setSourceCrs( QgsCoordinateReferenceSystem ) -2012-06-01 Werner Macho +Nyall Dawson 2013-05-22 - * i18n/qgis_gl_ES.ts: translation update: gl_ES by XAN + [FEATURE] Shift-clicking a selected composer item should deselect it -2012-06-01 Werner Macho +Radim Blazek 2013-09-05 - * i18n/qgis_cs_CZ.ts: translation update: cs_CZ by Jan + qgis_app lib link deps, fixes partialy #8575 -2012-06-01 Werner Macho +pcav 2013-09-05 - * i18n/qgis_lv.ts: translation update: lv by Maris + Typo in IT GUI translation -2012-06-01 Werner Macho +Juergen E. Fischer 2013-09-05 - * i18n/qgis_hu.ts: translation update: hu by Zoltan + temporary fix for #8575 (building app as DLL is more involved and requires a CORE/GUI/APP_EXPORT macro dance...) -2012-06-01 Werner Macho +Juergen E. Fischer 2013-09-05 - * i18n/qgis_es.ts: translation update: es by Carlos + fix atlas composition warnings with msvc 64bit -2012-05-31 Martin Dobias +Merge: 1aa5daf 00041e6 +Paolo Cavallini 2013-09-05 - * src/core/qgsvectorlayer.cpp: fix #5678 (old labeling does not work - with rule-based rendering) + Merge pull request #665 from Oslandia/overview_centering + + [2.1] Overview centering -2012-05-31 Jean-Roc Morreale +Juergen E. Fischer 2013-09-05 - * : commit af01338e308f614ff85ded43da731dc859e314cc Author: Jean-Roc - Morreale Date: Thu May 31 18:27:57 2012 - +0200 + german translation update -2012-05-31 Alexander Bruy +Werner Macho 2013-09-05 - * python/plugins/fTools/fTools.py, - python/plugins/fTools/tools/doPointsInPolygon.py, - python/plugins/fTools/tools/doSelectByLocation.py, - python/plugins/fTools/tools/frmPointsInPolygon.ui: run Points in - Polygon in separate thread and don't block QGIS main window - (addresses #5162) + translation update: fi by Kari -2012-05-31 Juergen E. Fischer +Radim Blazek 2013-07-05 - * doc/TRANSLATORS, i18n/qgis_de.ts, i18n/qgis_fr.ts, - i18n/qgis_it.ts, i18n/qgis_ru.ts, scripts/tsstat.pl: remove obsolete - parts from finished translations + added date type support -2012-05-31 Nathan Woodrow +Radim Blazek 2013-07-05 - * .mailmap: Add .mailmap file so that git shortlog reports stats - better + set field typeName in gml xsd parser -2012-05-30 Martin Dobias +Radim Blazek 2013-07-04 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp: fix #5665 - (rendering order not working in rule-based renderer) + added change signal to clipboard -2012-05-30 Martin Dobias +Radim Blazek 2013-07-03 - * : commit cbd88ee00120d4e27805f48cc046ac63f14f3078 Author: Juergen - E. Fischer Date: Wed May 30 18:39:07 2012 +0200 + copy/paste as test unit -2012-05-30 Juergen E. Fischer +Radim Blazek 2013-07-03 - * tests/src/core/testziplayer.cpp: fix test debug output + Paste as - new memory layer name dialog + Save as dialog collapsible OGR options -2012-05-29 Etienne Tourigny +Radim Blazek 2013-07-02 - * tests/src/core/testziplayer.cpp: skip vrt-in-zip test for gdal<1.7 + [FEATURE] Paste features as new vector layer -2012-05-29 Juergen E. Fischer +Juergen E. Fischer 2013-09-05 - * tests/src/core/testqgscoordinatereferencesystem.cpp: apply - #5598.33 + osgeo4w: fix shortcut removal -2012-05-29 Juergen E. Fischer +Merge: dcc9b2a cf6ad67 +Jürgen Fischer 2013-09-04 - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsmaptoolnodetool.h, src/core/qgis.h, - src/core/qgsgeometry.cpp, src/core/qgsgeometry.h, - src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h, - src/core/qgspoint.cpp, src/core/qgspoint.h, - src/core/qgsvectorlayer.cpp, src/gui/qgsprojectionselector.h: node - tool fixes: - fix OTFR support (fixes #5327.16) - smaller snap tolerance for geographic CRSs (fixes #5661) - use different snapping epsilons in - QgsVectorLayer::snapToGeometry() for layers with geographic and - projected crs. - [API] enhancements (to fix #5661): * QgsGeometry::closestSegmentWithContext: allow passing of segment - snapping epsilon * QgsPoint::sqrDistToSegment: allow assing of segment snapping - epsilon * QgsMapLayer::crs() add "const" + Merge pull request #873 from Cracert/i18n + + [function help] In strpos() needle is string, not number -2012-05-29 alexbruy +Merge: 7030b1a 51f42dd +Werner Macho 2013-09-04 - * : Merge pull request #154 from slarosa/master fix #2733 + Merge pull request #872 from Cracert/tr + + Polish translation update -2012-05-29 Juergen E. Fischer +Robert Szczepanek 2013-09-05 - * src/core/qgsvectorlayer.cpp: vector layer: also consider changed - geometries, when there's no select rectangle + [function help] In strpos() needle is string, not number -2012-05-29 Juergen E. Fischer +Robert Szczepanek 2013-09-04 - * src/gui/qgsprojectionselector.cpp: fix #5660 + pl translation update -2012-05-29 Werner Macho +Salvatore Larosa 2013-09-05 - * : Merge pull request #153 from rduivenvoorde/master translation update: new partial dutch translation + fix crash in Georeferencer plugin -2012-05-28 Giuseppe Sucameli +Salvatore Larosa 2013-09-05 - * src/providers/ogr/qgsogrdataitems.cpp: fix set crs to OGR data - items (broken in 04aab2938) + fix crash in Dxf2Shp plugin -2012-05-29 Giuseppe Sucameli +Salvatore Larosa 2013-09-05 - * : Merge remote-tracking branch 'etiennesky/browser_fixes' + fix crash in SpatialQuery plugin -2012-05-28 Juergen E. Fischer +Salvatore Larosa 2013-09-05 - * src/core/qgsvectorfilewriter.cpp: skip null values in vector file - writer (fixes #5172) + fix crash in GPS Importer plugin -2012-05-28 Juergen E. Fischer +Salvatore Larosa 2013-09-05 - * src/gui/qgsprojectionselector.cpp, - src/gui/qgsprojectionselector.h: fix #5030 + fix crash in SPIT plugin -2012-05-28 Tim Sutton +Juergen E. Fischer 2013-09-04 - * : Merge pull request #152 from dakcarto/patch-1 Add libqico.dylib copy and lib update to Mac app bundle for upcoming - 1.8... + fix crash in coordinate capture plugin -2012-05-28 Alexander Bruy +Merge: 7fc8ad8 f6e0bbc +Jürgen Fischer 2013-09-04 - * python/plugins/fTools/tools/doMeanCoords.py: update field list on - each layer list update (fix #5655) + Merge pull request #852 from borysiasty/installer_v2 + + [Plugin Installer] Remove hardcoded 2.0 v in order to use the native 2.0 -2012-05-28 Juergen E. Fischer +Juergen E. Fischer 2013-09-04 - * tests/src/core/testqgscoordinatereferencesystem.cpp: fix tests + debian packaging: update version to 2.1 -2012-05-21 Etienne Tourigny +Tim Sutton 2013-09-04 - * python/core/qgscoordinatereferencesystem.sip: add python binding - for QgsCoordinateReferenceSystem::createFromUserInput() + Bumped master version to 2.1.0 -2012-05-21 Etienne Tourigny +Juergen E. Fischer 2013-09-04 - * tests/src/core/testqgscoordinatereferencesystem.cpp, - tests/testdata/bug5598.prj: add more autotests for ESRI WKT + fix warnings -2012-05-21 Etienne Tourigny +Etienne Tourigny 2013-09-04 - * src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, - src/providers/ogr/qgsogrprovider.cpp: use GDAL_FIX_ESRI_WKT=GEOGCS - instead of TOWGS84 and maintain user-defined value + use svg icons in browser dock for uI consistency -2012-05-19 Etienne Tourigny +Merge: e6a4f2f 3d3f81d +Borys Jurgiel 2013-09-04 - * src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, - tests/src/core/testqgscoordinatereferencesystem.cpp: add ESRI .prj - test to make sure towgs84 is ok (bug #5598), and add - QgsCoordinateReferenceSystem::createFromUserInput() + Merge pull request #869 from Cracert/master + + Polish translation update -2012-05-19 Etienne Tourigny +Robert Szczepanek 2013-09-04 - * src/core/qgscoordinatereferencesystem.cpp: make sure - QgsCoordinateReferenceSystem::setProj4String() and createFromProj4() - trim the input proj4 string + pl translation update: small fix -2012-05-28 Juergen E. Fischer +Juergen E. Fischer 2013-09-04 - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsmaptoolnodetool.h, - src/app/nodetool/qgsselectedfeature.cpp, - src/app/nodetool/qgsselectedfeature.h, - src/app/nodetool/qgsvertexentry.cpp, - src/app/nodetool/qgsvertexentry.h: fix #5327 + sort embedded layer by drawing order (fixes #7673) -2012-05-28 Juergen E. Fischer +Nathan Woodrow 2013-09-04 - * debian/compat.sid, debian/compat.wheezy: debian packaging update + Update about icon, and 16x16 icon -2012-05-28 pcav +pcav 2013-09-04 - * i18n/qgis_it.ts: IT GUI transaltion completed after string freeze + Minor edit to IT GUI -2012-05-28 Werner Macho +D'Hont René-Luc 2013-09-04 - * i18n/qgis_sl_SI.ts: translation update: sl_SI by Joze + QGIS Server: Exclude composers in OWS tab does not work + + In the current QGIS server, if one uses a list of "Exclude composers" in the OWS tab, QGIS server lists only the excluded composers and not the composers the map author actually wants. So it acts as a white list and not as a black list. -2012-05-28 Etienne Tourigny +Juergen E. Fischer 2013-09-04 - * src/app/qgisapp.cpp, src/app/qgsbrowserdockwidget.cpp, - src/core/qgsdataitem.h, src/core/qgsmimedatautils.cpp, - src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdaldataitems.h, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrdataitems.h, - tests/src/core/testqgsdataitem.cpp: do not show file extension in - TOC, add QqsLayerItem::layerName() for getting layer name (bug - #5621) + update TRANSLATORS file -2012-05-27 Etienne Tourigny +Merge: d4e8e1f 4bd91f2 +Werner Macho 2013-09-04 - * src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/ogr/qgsogrdataitems.cpp: prevent .vrt and .gz files - from appearing as both GDAL and OGR items (bug #5636) + Merge pull request #868 from artfwo/master + + translation update: ru -2012-05-24 Etienne Tourigny +Artem Popov 2013-09-04 - * tests/src/core/CMakeLists.txt, - tests/src/core/testqgsdataitem.cpp, - tests/src/core/testziplayer.cpp, tests/testdata/points.vrt: add - tests for QgsDataItem - verify that .gz and .vrt files are not - recognized as both gdal and ogr items (bug #5636) + translation update: ru -2012-05-27 Werner Macho +Matthias Kuhn 2013-09-04 - * doc/TRANSLATORS, i18n/qgis_af.ts, i18n/qgis_ar.ts, - i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, - i18n/qgis_da_DK.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts, - i18n/qgis_es.ts, i18n/qgis_et_EE.ts, i18n/qgis_fa.ts, - i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_gl_ES.ts, - i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, - i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts, - i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, i18n/qgis_lo.ts, - i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts, - i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, - i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, i18n/qgis_ru.ts, - i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, - i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, i18n/qgis_ta.ts, - i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, - i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation - update: preparing for 1.8 release + [dual view] Propagate sort order to feature view (e.g. selected on top) -2012-05-27 Tim Sutton +Matthias Kuhn 2013-09-04 - * : Remove 'm' tagged QGIS icon in lead up to release of 1.8 + [dualview] Fix crash when removing features -2012-05-27 Tim Sutton +Werner Macho 2013-09-04 - * : commit 4295a687d1e9413c5e138d3fb94febe13996d79c Merge: 9d0745f - df79503 Author: alexbruy Date: Sun May - 27 00:29:18 2012 -0700 + translation update: nl by diethard -2012-05-27 Juergen E. Fischer +Merge: 14f639d 164d2fe +Werner Macho 2013-09-03 - * src/crssync/main.cpp: fix nightly builds + Merge pull request #866 from Cracert/master + + Polish translation update -2012-05-27 Juergen E. Fischer +Robert Szczepanek 2013-09-03 - * src/core/qgsmessageoutput.cpp: fix warning + pl translation update; function_help cont. -2012-05-26 Werner Macho +Tim Sutton 2013-09-04 - * : Merge pull request #149 from Jean-Roc/master update fr strings + Added South African north orientated CRS definitions for #8487 -2012-05-26 Juergen E. Fischer +Salvatore Larosa 2013-09-04 - * src/core/qgsvectorfilewriter.cpp: log OGR errors in - QgsVectorFileWriter::addFeature + load SLD properly if fill style polygon is defined: followup 4bc1beb -2012-05-26 Juergen E. Fischer +Giuseppe Sucameli 2013-09-04 - * debian/compat.sid, debian/compat.wheezy, - debian/libqgis-dev.install, debian/libqgis{QGIS_ABI}-dev.install, - debian/rules: debian packaging update + sld: fix #8567 -2012-05-26 Salvatore Larosa +Juergen E. Fischer 2013-09-04 - * python/plugins/fTools/tools/doGeoprocessing.py, - python/plugins/fTools/tools/ftools_utils.py: fix #3549 + osgeo4w: use nircmd also on 32bit -2012-05-26 Juergen E. Fischer +Juergen E. Fischer 2013-09-04 - * src/gui/qgsquerybuilder.cpp, - src/plugins/sqlanywhere/CMakeLists.txt, - src/plugins/sqlanywhere/sadbfilterproxymodel.cpp, - src/plugins/sqlanywhere/sadbfilterproxymodel.h, - src/plugins/sqlanywhere/saquerybuilder.cpp, - src/plugins/sqlanywhere/saquerybuilder.h, - src/plugins/sqlanywhere/sasourceselect.cpp, - src/plugins/sqlanywhere/sasourceselect.h, - src/providers/postgres/qgsdbfilterproxymodel.cpp, - src/providers/postgres/qgsdbfilterproxymodel.h: - replace SaQueryBuilder with QgsQueryBuilder - replace SaDbFilterProxyModel with QgsDbFilterProxyModel - remove spurious copy of QgsDbFilterProxyModel from postgres - provider - fix #4491 + nsis: add 64 support -2012-05-26 Tim Sutton +Juergen E. Fischer 2013-09-03 - * NEWS, doc/news.html, doc/news.t2t: Updates whats new documentation - for 1.8 + creatensis.pl: update to support 32 and 64bit packages -2012-05-26 Juergen E. Fischer +Juergen E. Fischer 2013-09-03 - * src/crssync/main.cpp: fix #5490 + indentation update -2012-05-25 Juergen E. Fischer +Martin Dobias 2013-09-03 - * src/gui/qgsmaptip.cpp: remove unused includes + Updated QgsFields docs, moved some code into .cpp -2012-05-25 Jean-Roc Morreale +Juergen E. Fischer 2013-09-03 - * i18n/qgis_fr.ts: update fr strings + german translation update -2012-05-25 Jean-Roc Morreale +Merge: b0664f4 cf0b7b0 +Werner Macho 2013-09-03 - * : commit afcd5b6e3c1f727bce967c4fd1d039665d76127c Author: Marco - Hugentobler Date: Fri May 25 - 22:43:31 2012 +0200 + Merge pull request #864 from Jean-Roc/traduction_ui + + update fr translation -2012-05-25 Juergen E. Fischer +Merge: e7a3215 c331f1e +Werner Macho 2013-09-03 - * python/plugins/fTools/tools/doValidate.py, src/app/qgisapp.cpp, - src/gui/qgsmaptip.cpp: fix #4521 + Merge pull request #865 from yoichigmf/forpullreq + + update TRANSLATION ja -2012-05-25 Tim Sutton +Jean-Roc Morreale 2013-09-03 - * : commit 88a319a4fc1f7909c7aefc7871553e32ec04f20d Author: Tim - Sutton Date: Fri May 25 18:38:10 2012 +0200 + update fr translation -2012-05-25 Juergen E. Fischer +yoichigmf 2013-09-04 - * doc/TRANSLATORS, i18n/qgis_de.ts, scripts/tsstat.pl: german - translation update + update TRANSLATION ja -2012-05-25 Juergen E. Fischer +Salvatore Larosa 2013-09-03 - * python/gui/qgsmapcanvas.sip, - python/plugins/fTools/tools/doValidate.py: sip bindings: add - /Transfer/ to QgsMapCanvas::mapRenderer() (otherwise - mc.mapRenderer().hasCrsTransformEnabled() can crash) + fixes "Add to Overview" action, also removes shortcut -2012-05-25 Juergen E. Fischer +pcav 2013-09-03 - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/doValidate.py, src/app/qgisapp.cpp, - src/app/qgscustomization.cpp, src/core/qgsgeometry.cpp, - src/core/qgsgeometryvalidator.cpp, src/core/qgsmessageoutput.cpp, - src/core/qgsmessageoutput.h: validation/geometry/threading fixes: - fTools/polygon centroids: catch missing centroid with invalid - geometry (fixes #4963) - fTools/validate geometry: * fix final position of progress bar * don't use isGeosValid() * zoom to feature on locationless errors (including OTFR support) * store/restore dialog position - QgsGeometry(Validator): * log GEOS exceptions * (closed) rings need at least 4 points not 3 * log error when geometry can't be exported to GEOS * don't produce "geometry is valid" error - improve logging from threads * keep message output from main thread as popup * log message from threads to message log (fixes crash on python - error in thread) + Upadated list of IT translators -2012-05-25 Juergen E. Fischer +pcav 2013-09-03 - * src/gui/qgsmessagelogviewer.cpp, src/gui/qgsmessagelogviewer.h: - message log: fix crash on exit + IT GUI translation almost finished -2012-05-25 alexbruy +Merge: 70841a8 eb11479 +Nathan Woodrow 2013-09-03 - * : Merge pull request #148 from slarosa/master minor fixes in fTools GUI + Merge pull request #804 from nyalldawson/bug_8311 + + Fix some bugs relating to display fields for new vector layers (fixes #8311) -2012-05-25 slarosa +Denis Rouzaud 2013-09-03 - * python/plugins/fTools/tools/frmSpatialJoin.ui, - python/plugins/fTools/tools/frmVectorSplit.ui: minor fixes in gui - fTools + [postgres] do not update feature count if it was not set before -2012-05-24 Mathieu Bossaert +Nathan Woodrow 2013-09-03 - * i18n/qgis_fr.ts: update french strings, plus que 34! mathieu + Fix #8561 - Handle change layer in node tool -2012-05-24 Juergen E. Fischer +vmora 2013-07-30 - * python/plugins/fTools/tools/doValidate.py: fTools: fix handling of - locationless geometry errors (fixes #4396) + - fix #7441 + - reset unit settings to original ones when deactivating OTF projection + + - added OTF status (on/off) to mesuredialog title + + - resets prefered units and selected srs + - when OTF transfo is deselected, this resets the units value to the + original ones -2012-05-24 Jean Roc +Matthias Kuhn 2013-09-03 - * : Merge pull request #3 from mathieubossaert/master traduction française + [diagram] Workaround floating point errors leading to diagram distortion + Fix #8554 -2012-05-24 Radim Blazek +Merge: 9014d5c 5be1807 +Werner Macho 2013-09-02 - * src/plugins/grass/qgsgrassnewmapset.cpp: restricted - location/mapset names in GRASS new mapset dialog, fixes #4258 + Merge pull request #862 from Cracert/master + + Polish translation update -2012-05-24 Radim Blazek +Robert Szczepanek 2013-09-02 - * src/plugins/grass/locations.gml: Europe extent, fixed #5080 + pl translation update; function_help -2012-05-24 Juergen E. Fischer +Werner Macho 2013-09-03 - * debian/rules: debian packaging: optionally remove api/installdox + translation update: es by Carlos -2012-05-24 Mathieu Bossaert +Merge: a339702 f5d41d5 +Werner Macho 2013-09-02 - * i18n/qgis_fr.ts: update french strings + Merge pull request #861 from Jean-Roc/traduction_ui + + update french translation -2012-05-24 Juergen E. Fischer +Larry Shaffer 2013-09-02 - * i18n/qgis_de.ts, src/ui/qgsprojectionselectorbase.ui: fix #5632 + [gui] Address situation where applying style enables deprecated labels -2012-05-24 Juergen E. Fischer +Jean-Roc Morreale 2013-09-02 - * doc/TRANSLATORS, i18n/qgis_de.ts, scripts/update_ts_files.sh: - german translation update + update french translation -2012-05-23 Juergen E. Fischer +Matthias Kuhn 2013-09-02 - * src/app/qgscustomization.cpp, src/core/qgsapplication.cpp: take - III on #5597 + [dualview] Remove unrequired connect() -2012-05-23 Juergen E. Fischer +Merge: 91b9c11 8ff0f02 +Werner Macho 2013-09-02 - * src/app/qgscustomization.cpp: another take on #5597 + Merge pull request #860 from Cracert/master + + Polish translation update -2012-05-23 Alexander Bruy +Robert Szczepanek 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: some fixes in - geoprocessing tools (hope this will fix database support) + pl translation update; topology, style manager, SVG, WFS, WCS, WMS, checkDock -2012-05-23 Radim Blazek +Victor Olaya 2013-09-02 - * src/app/qgscustomization.cpp: check thread in customization, it - should fix #5597 + [processing] fixed bug when editing help of example models -2012-05-23 Alexander Bruy +Victor Olaya 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: make Clip tool - work with SpatiaLite layers (fix #4571) + added scintilla based editor to R scripts editor -2012-05-23 Alexander Bruy +Victor Olaya 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: make Dissolve tool - work with SpatiaLite (addresses #4571) + [processing] improved handling of output files and file naming -2012-05-23 Tim Sutton +Victor Olaya 2013-09-01 - * : commit c367a35ce9ae468660d2b25de9c04ec3613102bb Author: - Alexander Bruy Date: Tue May 22 - 17:52:15 2012 +0300 + [processing] modified saga ids description and fixed example script bug -2012-05-22 Alexander Bruy +Victor Olaya 2013-09-01 - * python/plugins/fTools/tools/doRandPoints.py, - python/plugins/fTools/tools/ftools_utils.py: correctly handle WMS - rasters in Random Points tool (fix #5202) + [processing] added extent as output type and made it available in modeler -2012-05-22 Alexander Bruy +Victor Olaya 2013-09-01 - * python/plugins/fTools/tools/doRandPoints.py: make "use value from - field" available in Random Points tools, also show only integer - fields (fix #4570) + [processing] improved script edit dialog -2012-05-22 Juergen E. Fischer +Victor Olaya 2013-09-01 - * src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp: fix crash on - opening symbol levels dialog when using categorized renderer with - showClassifiers + [processing] modified saga checking to support 2.0.8 -2012-05-22 Alexander Bruy +Matthias Kuhn 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: fix #5617. Patch - submitted by Salvatore Larosa, thanks! + [dualview] Default preview text shows also up for NULL values -2012-05-22 Alexander Bruy +Matthias Kuhn 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: Revert last commit This reverts commit 5cb6dd7c0b686890cffff1c0d4476dfa2dce57f9. + [dualview] Fix add/delete crash and fieldcalc behavior of feature form -2012-05-22 Alexander Bruy +Larry Shaffer 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: store geometries - from GeometryCollection in list + [tests] Add preconfigured project to test local server connection -2012-05-22 Marco Hugentobler +Werner Macho 2013-09-02 - * src/core/qgsvectorlayer.cpp: Split tool: prefer default values for - new features vs. values copied from original feature. Fixes ticket - #5475 + translation update: chinese with adding new translator -2012-05-21 Radim Blazek +Matthias Kuhn 2013-09-02 - * : commit 5a4412a21d096162436d90537595a4eca7e6df68 Author: Radim - Blazek Date: Mon May 21 20:47:03 2012 - +0200 + [dualview] Fix crash when adding columns with feature form open -2012-05-20 Juergen E. Fischer +Salvatore Larosa 2013-09-02 - * src/providers/mssql/qgsmssqlprovider.cpp: fix 'unused' warning + [pyqgis-console] update pyqgis.pap file after 2d63dcf -2012-05-21 Alexander Bruy +Merge: a2a2d7a 87e2ad7 +Werner Macho 2013-09-02 - * python/plugins/fTools/tools/doGeoprocessing.py: partial fix for - #5617 from Salvatore Larosa (slightly modified) + Merge pull request #859 from Jean-Roc/traduction_ui + + update french translation -2012-05-21 Juergen E. Fischer +Jean-Roc Morreale 2013-09-02 - * src/app/qgscustomprojectiondialog.cpp, src/app/qgsoptions.cpp, - src/core/qgsdistancearea.cpp, src/core/qgsmaplayer.cpp, - src/gui/qgsprojectionselector.cpp, src/helpviewer/qgshelpviewer.cpp: - open sqlite3 database readonly where possible (another followup on - 9154e4e) + update french translation -2012-05-21 Juergen E. Fischer +Larry Shaffer 2013-09-02 - * doc/index.dox: update icon link for api doc - again + [gui] Fix crash when loading a vector layer style, due to lack of checks for removed deprecated labels tab -2012-05-21 Juergen E. Fischer +Denis Rouzaud 2013-09-02 - * doc/index.dox: update icon link for api doc + fix missing sip methods for rubber bands -2012-05-20 Giuseppe Sucameli +Werner Macho 2013-09-02 - * python/plugins/db_manager/db_plugins/connector.py: DBManager: - added missing required (not implicit) self argument + translation update: sv by Victor -2012-05-20 Giuseppe Sucameli +Merge: d8b05c2 868974e +Werner Macho 2013-09-02 - * python/plugins/db_manager/table_viewer.py: DBManager: don't raise - any errors while disconnecting signals from destroyed objects + Merge pull request #857 from artfwo/master + + Russian translation update. -2012-05-19 Giuseppe Sucameli +Artem Popov 2013-09-02 - * python/plugins/db_manager/db_manager.py: DBManager: remove label - from separators (fix #5393) + Russian translation update. -2012-05-20 Tim Sutton +Larry Shaffer 2013-08-25 - * src/providers/mssql/qgsmssqlprovider.cpp: Marked - updateFeatureCount as unused (removes compiler warning) + [tests] Add support for locally spawned fcgi process + + - No building of spawn-fcgi or managing of spawned process, yet -2012-05-19 Etienne Tourigny - - * src/core/qgsdataitem.cpp, tests/src/core/testziplayer.cpp: fix zip - file reading for gdal<1.9 and add test for folder-in-zip - -2012-05-19 Tim Sutton - - * : Merge pull request #142 from etiennesky/fix_crs Fix crs issues - -2012-05-19 Etienne Tourigny - - * src/core/qgscoordinatereferencesystem.cpp: prefer non-deprecated - crses (fixes part of #4977) - -2012-05-19 Etienne Tourigny - - * src/core/qgscoordinatereferencesystem.cpp: trim proj4 parameters - for sql queries (#5598) - -2012-05-18 Etienne Tourigny - - * src/core/qgsdataitem.cpp: zip files: update VSIReadDirRecursive1() - from VSIReadDirRecursive() in gdal trunk, fixes long filename issues - (see gdal bug#4658) - -2012-05-18 Juergen E. Fischer - - * scripts/addcopyright.sh, src/analysis/interpolation/HalfEdge.cc, - src/analysis/interpolation/TriangleInterpolator.cc, - src/analysis/interpolation/Triangulation.cc, - src/analysis/raster/qgsrastercalcnode.cpp, - src/app/composer/qgscomposerlegendlayersdialog.cpp, - src/app/composer/qgscomposerlegendlayersdialog.h, - src/app/legend/qgslegendgroup.cpp, src/app/legend/qgslegendgroup.h, - src/app/legend/qgslegenditem.cpp, src/app/legend/qgslegenditem.h, - src/app/legend/qgslegendlayer.cpp, src/app/legend/qgslegendlayer.h, - src/app/legend/qgslegendpropertygroup.cpp, - src/app/legend/qgslegendpropertygroup.h, - src/app/legend/qgslegendpropertyitem.cpp, - src/app/legend/qgslegendpropertyitem.h, - src/app/legend/qgslegendsymbologygroup.cpp, - src/app/legend/qgslegendsymbologygroup.h, - src/app/legend/qgslegendsymbologyitem.cpp, - src/app/legend/qgslegendsymbologyitem.h, - src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h, - src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h, - src/app/qgsformannotationdialog.cpp, - src/app/qgsformannotationdialog.h, - src/app/qgslabelengineconfigdialog.cpp, - src/app/qgslabelengineconfigdialog.h, src/app/qgslabelpreview.cpp, - src/app/qgslabelpreview.h, src/app/qgstip.h, - src/app/qgstipfactory.cpp, src/app/qgstipfactory.h, - src/app/qgsundowidget.cpp, src/app/qgsundowidget.h, - src/core/pal/costcalculator.cpp, src/core/pal/costcalculator.h, - src/core/qgsbrowsermodel.cpp, src/core/qgsbrowsermodel.h, - src/core/qgsdiagram.cpp, src/core/qgsdiagram.h, - src/core/qgsdiagramrendererv2.cpp, src/core/qgsdiagramrendererv2.h, - src/core/qgslabelsearchtree.cpp, src/core/qgsmimedatautils.cpp, - src/core/qgsmimedatautils.h, src/core/qgspluginlayer.cpp, - src/core/qgspluginlayer.h, src/core/qgspythonrunner.cpp, - src/core/qgspythonrunner.h, src/core/qgsvectorlayerundocommand.cpp, - src/core/qgsvectorlayerundocommand.h, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.h, - src/core/symbology-ng/qgscolorbrewerpalette.h, - src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.h, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.h, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h, - src/core/symbology-ng/qgslinesymbollayerv2.cpp, - src/core/symbology-ng/qgslinesymbollayerv2.h, - src/core/symbology-ng/qgsmarkersymbollayerv2.cpp, - src/core/symbology-ng/qgsmarkersymbollayerv2.h, - src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrendererv2registry.cpp, - src/core/symbology-ng/qgsrendererv2registry.h, - src/core/symbology-ng/qgssinglesymbolrendererv2.cpp, - src/core/symbology-ng/qgssinglesymbolrendererv2.h, - src/core/symbology-ng/qgsstylev2.cpp, - src/core/symbology-ng/qgsstylev2.h, - src/core/symbology-ng/qgssymbollayerv2.cpp, - src/core/symbology-ng/qgssymbollayerv2.h, - src/core/symbology-ng/qgssymbollayerv2registry.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.h, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.h, - src/core/symbology-ng/qgssymbologyv2conversion.cpp, - src/core/symbology-ng/qgssymbologyv2conversion.h, - src/core/symbology-ng/qgssymbolv2.cpp, - src/core/symbology-ng/qgssymbolv2.h, - src/core/symbology-ng/qgsvectorcolorrampv2.cpp, - src/core/symbology-ng/qgsvectorcolorrampv2.h, - src/gui/qgsprojectbadlayerguihandler.cpp, - src/gui/qgsprojectbadlayerguihandler.h, - src/gui/symbology-ng/qgsbrushstylecombobox.cpp, - src/gui/symbology-ng/qgsbrushstylecombobox.h, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgscolorrampcombobox.cpp, - src/gui/symbology-ng/qgscolorrampcombobox.h, - src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp, - src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgspenstylecombobox.cpp, - src/gui/symbology-ng/qgspenstylecombobox.h, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.h, - src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/gui/symbology-ng/qgsrendererv2widget.h, - src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h, - src/gui/symbology-ng/qgsstylev2managerdialog.cpp, - src/gui/symbology-ng/qgsstylev2managerdialog.h, - src/gui/symbology-ng/qgssymbollayerv2widget.cpp, - src/gui/symbology-ng/qgssymbollayerv2widget.h, - src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp, - src/gui/symbology-ng/qgssymbollevelsv2dialog.h, - src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp, - src/gui/symbology-ng/qgssymbolv2propertiesdialog.h, - src/gui/symbology-ng/qgssymbolv2selectordialog.cpp, - src/gui/symbology-ng/qgssymbolv2selectordialog.h, - src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp, - src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h, - src/gui/symbology-ng/qgsvectorfieldwidget.h, - src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp, - src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h, - src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp, - src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h, - src/mapserver/qgsgetrequesthandler.cpp, - src/mapserver/qgslogicalfilter.cpp, src/mapserver/qgsmsutils.cpp, - src/mapserver/qgsmsutils.h, - src/plugins/diagram_overlay/qgsdiagramrenderer.cpp, - src/plugins/globe/qgsosgearthtilesource.cpp, - src/plugins/globe/qgsosgearthtilesource.h, - src/plugins/grass/qgis.g.browser.cpp, - src/plugins/interpolation/qgsidwinterpolatordialog.cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - h, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdaldataitems.h, - src/providers/grass/qgis.d.rast.c, - src/providers/grass/qgis.g.info.c, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h, - src/providers/spatialite/qgsspatialiteconnection.cpp, - src/providers/spatialite/qgsspatialiteconnection.h, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.h, - src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsconnection.h, - src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wfs/qgswfsdataitems.h, - src/providers/wfs/qgswfsutils.cpp, src/providers/wfs/qgswfsutils.h, - src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h: add missing copyright headers - to c++ files - -2012-05-18 Juergen E. Fischer - - * src/core/qgscoordinatereferencesystem.cpp: fix #5176 - -2012-05-17 Juergen E. Fischer - - * src/providers/postgres/qgspostgresprovider.cpp: log more verbose - error messages if the view primary key selection is wrong. - -2012-05-18 D'Hont René-Luc - - * src/mapserver/qgswfsserver.cpp, src/mapserver/qgswfsserver.h: WFS - service Capability request resource bug - -2012-05-17 Juergen E. Fischer - - * src/app/main.cpp, src/python/qgspythonutilsimpl.cpp: fix #5544 - -2012-05-17 Marco Hugentobler - - * src/core/qgsmaprenderer.cpp: QgsMapRenderer: Load projection flag - and destination CRS before extent. Fixes ticket #5605 +pcav 2013-09-02 -2012-05-17 Jean-Roc Morreale + More IT GUI translation - * i18n/qgis_fr.ts: update fr strings +Merge: f4b2c16 514e899 +Werner Macho 2013-09-01 -2012-05-17 Jean-Roc Morreale + Merge pull request #855 from asiersarasua/master + + Basque translation update - * : commit bfd846a192de1c1da98f8f0b7b89a598c7c5d960 Author: Juergen - E. Fischer Date: Wed May 16 21:05:46 2012 +0200 +Werner Macho 2013-09-02 -2012-05-16 Juergen E. Fischer + translation update: id by Trias and ko_KR by BJ - * src/providers/wms/qgswmsprovider.cpp: fix feature info for WMS 1.3 +Merge: c48243c 33fe3c8 +Werner Macho 2013-09-01 -2012-05-16 Juergen E. Fischer + Merge pull request #856 from Cracert/master + + Polish translation update - * debian/control.lucid, debian/control.oneiric, - debian/control.precise: debian packaging: add optional support for - gdal 1.9 in ubuntu lucid/oneiric/precise +Larry Shaffer 2013-09-01 -2012-05-16 Alexander Bruy + [gui] Update Mac icons with latest vectorized logo + + - Add qml and mldata (memory layer) to file extension mappings - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/doSimplify.py: show warning before - updating exisiting shapefile (fix #5335) +Robert Szczepanek 2013-09-02 -2012-05-15 Jean-Roc Morreale + pl translation update; PostgreSQL, SpatiaLite - * : commit 2caba61bbad7967ccaa9a41dd5f92ad64d353902 Author: Jean-Roc - Morreale Date: Sun May 13 19:24:03 2012 - +0200 +asiersarasua 2013-09-01 -2012-05-13 Alexander Bruy + Basque translation update - * python/plugins/fTools/tools/doSimplify.py: minor formatting fixes +Borys Jurgiel 2013-09-01 -2012-05-13 alexbruy + [Plugin Manager] Fix #8542 - * : Merge pull request #140 from slarosa/master Add Multigeometries support in Simplify tool +Salvatore Larosa 2013-09-01 -2012-05-12 slarosa + [pyqgis-console] add prefix OSGeo_ to GEOS API file - * python/plugins/fTools/tools/doSimplify.py: Add Multigeometries - support in Simplify tool for geomVertexCount function +Werner Macho 2013-09-01 -2012-05-12 Alexander Bruy + translation update: gl and zh_CN - * python/plugins/fTools/tools/doSimplify.py: also add MultiPolygon - support in Densify geometry +Merge: cae08e4 d876560 +Werner Macho 2013-09-01 -2012-05-12 Alexander Bruy + Merge pull request #854 from Jean-Roc/traduction_ui + + update french translation - * python/plugins/fTools/tools/doSimplify.py: add MultiLineString - support to Densify geometries tool (addresses #5577) +Larry Shaffer 2013-08-31 -2012-05-04 Marco Hugentobler + [gui] Remove deprecated labeling properties tab for new projects or older ones that don't use them + + - Deprecated tab remains active for older projects, if any layer uses them + - Deprecated tab an be disabled/enabled via console commands for project entry, e.g.: + QgsProject.instance().writeEntry('DeprecatedLabels', '/Enabled', bool) or + QgsProject.instance().removeEntry('DeprecatedLabels', '/') - * src/mapserver/CMakeLists.txt, src/mapserver/qgsmslayercache.h: - QgsMSLayerCache inherits from QObject to use signal/slot mechanism +Salvatore Larosa 2013-09-01 -2012-05-04 Marco Hugentobler + Fix untranslatable strings: does not break translation + with a different language from english the plugin menus are + not removed. this commit fixes the problem. - * src/mapserver/qgshostedrdsbuilder.cpp, - src/mapserver/qgshostedvdsbuilder.cpp, - src/mapserver/qgsmslayercache.cpp, src/mapserver/qgsmslayercache.h, - src/mapserver/qgsremoteowsbuilder.cpp: Empty config file entry in - layer cache for sld layers +Jean-Roc Morreale 2013-09-01 -2012-05-04 Marco Hugentobler + update french translation - * src/mapserver/qgshostedrdsbuilder.cpp, - src/mapserver/qgshostedvdsbuilder.cpp, - src/mapserver/qgsmslayercache.cpp, src/mapserver/qgsmslayercache.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsremoteowsbuilder.cpp: Invalidate cache layers if - project files are changed +Werner Macho 2013-09-01 -2012-05-11 Juergen E. Fischer + translation update: german - * INSTALL, doc/INSTALL.html: run make t2tdoc +Werner Macho 2013-09-01 -2012-05-11 Juergen E. Fischer + make alg work in modeller - * doc/linux.t2t: re-run scripts/scandeps.pl +Werner Macho 2013-09-01 -2012-05-11 Juergen E. Fischer + translation update: danish by jacob - * cmake/FindGDAL.cmake: fix GDAL version check +Merge: 3ac0759 7c726ee +Werner Macho 2013-09-01 -2012-05-10 Juergen E. Fischer + Merge pull request #853 from gioman/master + + pt_PT translators list updated - * src/app/qgsoptions.cpp: fix overriding of locale in options +Salvatore Larosa 2013-09-01 -2012-05-09 Marco Hugentobler + [dbmanager] Replace DropRasterTable func (deprecated) with DROP TABLE: fixes #8521 - * src/analysis/raster/qgsrastercalculator.cpp: Rastercalculator: fix - for reading out of source raster bounds +Salvatore Larosa 2013-09-01 -2012-05-08 Tim Sutton + [pyqgis-console] add GEOS API file for autocompletion: + - add GDAL-1.10.0, QScintilla-2.7.2 api files - * : Merge pull request #139 from etiennesky/zip_fixes Zip support fixes from Etienne +Salvatore Larosa 2013-09-01 -2012-05-06 Etienne Tourigny + [dbmanager] another small fix for italian translation: fixes #8489 - * src/core/qgsdataitem.cpp, src/core/qgsmaplayer.cpp, - tests/src/core/testziplayer.cpp: fix ziplayer handling for windows +Giovanni Manghi 2013-09-01 -2012-05-08 Werner Macho + pt_PT translators list updated - * i18n/qgis_sl_SI.ts: translation update: sl_SI by Joze +Werner Macho 2013-09-01 -2012-05-07 Tim Sutton + translation update: es gl and ja - * src/plugins/georeferencer/qgsgeorefplugingui.cpp: Mark unused var +Merge: 74b60c6 f516759 +Werner Macho 2013-09-01 -2012-05-07 Juergen E. Fischer + Merge pull request #850 from yoichigmf/translate_ja + + Translate ja - * src/gui/qgsmessagelogviewer.cpp: improve message log resizing +pcav 2013-09-01 -2012-05-07 Werner Macho + More IT GUI translation - * : Merge pull request #138 from Cracert/trans translation update: PL by Robert +Borys Jurgiel 2013-09-01 -2012-05-07 Nathan Woodrow + [Plugin Installer] Remove hardcoded 2.0 version in order to use the native 2.0 - * src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.h: Remove old GCPs in - georeferencer; clear image on close. Fixes #4310 +Salvatore Larosa 2013-09-01 -2012-05-06 Tim Sutton + [dbmanager] small fix for import/export layer UI - * : commit 54eabf300b612d52be89bffbd1f41916b95a4938 Author: Tim - Sutton Date: Sun May 6 22:00:42 2012 +0200 +yoichigmf 2013-09-01 -2012-05-06 Werner Macho + update ja translation - * : Merge pull request #136 from Jean-Roc/master translation update: fr by JR +Larry Shaffer 2013-08-31 -2012-04-28 Juergen E. Fischer + [gui] Fix triple-modal issue on Mac for point displacement dialog + + - Ensure initial dialog is a 'sheet' or gui will freeze after closing next opened modal (new color) dialog - * tests/bench/main.cpp, - tests/src/analysis/testqgsvectoranalyzer.cpp, - tests/src/core/regression1141.cpp, - tests/src/core/regression992.cpp, tests/src/core/runtests.sh, - tests/src/core/test_builder.pl, - tests/src/core/test_suite_builder.sh, - tests/src/core/testqgsapplication.cpp, - tests/src/core/testqgsgeometry.cpp, - tests/src/core/testqgsmaplayer.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgspoint.cpp, - tests/src/core/testqgsrenderers.cpp, - tests/src/core/testqgsvectorfilewriter.cpp, - tests/src/core/testqgsvectorlayer.cpp, - tests/src/core/testziplayer.cpp, - tests/src/gui/testqgsmaptoolzoom.cpp, - tests/src/gui/testqgsquickprint.cpp, tests/src/runtests.sh: test - cleanups +Werner Macho 2013-08-31 -2012-05-06 Alexander Bruy + another dutch translation update - * src/plugins/georeferencer/georeferencer.qrc: remove unused icons +Larry Shaffer 2013-08-31 -2012-05-06 Alexander Bruy + [gui] Fix excessive fixed height of vector properties (actually labeling) dialog + + - Should now fit on laptops with limited screen height - * src/plugins/georeferencer/georeferencer.qrc, - src/plugins/georeferencer/icons/default/qgis.xpm, - src/plugins/georeferencer/icons/qgis.xpm, - src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui, - src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.h, - src/plugins/georeferencer/qgsmapcoordsdialog.cpp, - src/plugins/georeferencer/qgstransformsettingsdialog.cpp: new icons - for Georeferencer plugin (fix #5530) +Larry Shaffer 2013-08-31 -2012-05-05 Werner Macho + [labeling] Further fix for #8367, 'font missing' text keeps showing up + + - Move to more generic test on font family - * : Merge pull request #135 from Cracert/trans Translation update PL +Werner Macho 2013-08-31 -2012-05-06 Robert Szczepanek + translation update: pl by robert - * i18n/qgis_pl_PL.ts: translation PL test +Merge: 6e19748 735f534 +Werner Macho 2013-08-31 -2012-05-05 Marco Hugentobler + Merge pull request #849 from gioman/master + + pt_pt translations contributed by Nelson Silva - * src/core/raster/qgsrasterlayer.cpp: Save memory in raster - rendering +Larry Shaffer 2013-08-31 -2012-05-04 alexbruy + [pyqgis-console] Fix build error. Revert adding of qsci-pap-master target + + - Leave only qsci-pap-src target for updating default pyqgis.pap in source tree + - Mark WITH_QSCIAPI as advanced in CMake, since it mostly a dev function - * : Merge pull request #134 from artfwo/master Russian translation update for 1.8 +Giovanni Manghi 2013-08-31 -2012-05-04 Tim Sutton + pt_pt translations contributed by Nelson Silva - * src/providers/postgres/qgspostgresprovider.h: Removed return - for - pg provider crs method comments +Werner Macho 2013-08-31 -2012-05-04 Sandro Santilli + as always .. forgot one - * src/providers/postgres/qgspostgresprovider.h: typo +Werner Macho 2013-08-31 -2012-05-04 Nathan Woodrow + last translation update before branching - * src/app/composer/qgscomposer.cpp: Disable floating dock widgets in - composer. Fix #5118 +Merge: 460b007 e56b1bc +Werner Macho 2013-08-31 -2012-05-03 Giuseppe Sucameli + Merge pull request #847 from Cracert/tr + + Correct spelling in polish translators names - * python/plugins/db_manager/ui/DlgAbout.ui: remove the unused DB - Manager About dialog .ui +Robert Szczepanek 2013-08-31 -2012-05-03 Giuseppe Sucameli + Correct spelling in polish translators names - * python/plugins/db_manager/db_manager.py: fix #5541 +Salvatore Larosa 2013-08-31 -2012-05-03 William Kyngesburye + [pyqgis-console] adds a "\n" at the end of the header text if it has not been inserted from translators - * mac/cmake/2lib.cmake.in: bundle libspatialindex in app +Salvatore Larosa 2013-08-31 -2012-05-03 William Kyngesburye + [pyqgis-console] minor fixes for italian translation - * INSTALL, doc/INSTALL.html, doc/osx.t2t: add spatialindex to OSX - install instructions +Werner Macho 2013-08-31 -2012-05-03 William Kyngesburye + translation update: fr and it - * mac/cmake/1qt.cmake.in: bundle more Qt imageformats that might be - useful to external plugins +Larry Shaffer 2013-08-31 -2012-05-02 Tim Sutton + [pyqgis-console] Fix pyqgis.pap building targets/script for auto-completion in console + + - Add fixed default pyqgis.pap - * : Added anomaly tests for stingray +Larry Shaffer 2013-08-30 -2012-05-02 Werner Macho + [labeling] Fix python bindings for access to data defined properties - * i18n/qgis_cs_CZ.ts: translation update: cs_CZ by Jan +Merge: f5585d8 94a440f +pcav 2013-08-31 -2012-05-02 Tim Sutton + Merge branch 'master' of github.com:qgis/Quantum-GIS - * tests/src/core/testziplayer.cpp: Applied patch from Etienne to - make gzip/zip tests run under linux +pcav 2013-08-31 -2012-05-01 Alexander Bruy + List of IT translators updated and sorted - * python/plugins/fTools/tools/doSelectByLocation.py, - python/plugins/fTools/tools/ftools_utils.py: SpatiaLite support in - Select by Location tool (fix #5264) +Merge: 9b72523 b14ffb7 +Nathan Woodrow 2013-08-31 -2012-05-01 Alexander Bruy + Merge pull request #844 from minorua/union_attrs + + fTools/union: fix output attribute shift - * src/ui/qgsoptionsbase.ui: fix duplicate control names +Merge: 17d5fe9 1380e45 +Werner Macho 2013-08-30 -2012-04-30 Nathan Woodrow + Merge pull request #843 from Cracert/master + + Polish translation upadte - * python/core/qgsgpsconnection.sip: Add convert to subclass for - QgsGpsConnection for python bindings +Minoru Akagi 2013-08-31 -2012-04-30 Tim Sutton + fTools/union: fix output attribute shift - * : Merge pull request #131 from etiennesky/zip_qml2 [TEST][API]improved qml support for zip layers and more tests +Robert Szczepanek 2013-08-31 -2012-04-30 Tim Sutton + pl translation upadte: raster layers - * images/images.qrc, src/ui/qgsabout.ui: Added developers meeting - pic in help -> about -> developers as per Paolo's request +Merge: dc46285 53d8cf4 +Werner Macho 2013-08-30 -2012-04-30 Tim Sutton + Merge pull request #841 from Cracert/master + + Polish translatioin update - * : Copied over splash from old 1.8 branch +Larry Shaffer 2013-08-29 -2012-04-30 Tim Sutton + [pyqgis-console] Add targets and python script for generating console's QScintilla .pap file, for auto-completion + + - Run 'make;make qsci-pap-src; make install' to update the default .pap file in source tree + - Run 'make;make qsci-pap-master[; make install]' for local-only .pap that overrides the default .pap (when testing new bindings) + - Update console to override default .pap if master.pap is available + - Include new qgis.core.NULL attribute defined in /python/__init__.py for QPyNullVariant comparisons + - Update 11-month-old default .pap - * CMakeLists.txt: Changed version to 1.8 +Robert Szczepanek 2013-08-30 -2012-04-29 Alexander Bruy + pl translation update; forms - * src/core/qgsvectorfilewriter.cpp: allow export vector data to ESRI - FileGDB +Merge: b99d51d e162506 +Werner Macho 2013-08-30 -2012-04-29 Alexander Bruy + Merge pull request #840 from artfwo/master + + Russian translation update. - * src/core/qgsexpression.cpp: multipoint geometry support in Field - Calculator (fix #5513) +Salvatore Larosa 2013-08-30 -2012-04-29 Alexander Bruy + [pyqgis-console] avoids IndexError when attempts to run unselected code by keybinding Ctrl+E - * python/plugins/fTools/tools/doGeometry.py: add multipoint geometry - support to Export/Add geometry column. Thanks to Salvatore for - investigating issue +Matthias Kuhn 2013-08-30 -2012-04-29 Alexander Bruy + Add != (not equal) support to python NULL value - * src/plugins/interpolation/qgsinterpolationplugin.cpp, - src/plugins/interpolation/qgsinterpolationplugin.h: remove unused - signal +Victor Olaya 2013-08-30 -2012-04-29 Werner Macho + [processing] fixed issue when opening link from MissingDependencyDialog.py - * doc/TRANSLATORS, i18n/qgis_gl_ES.ts, i18n/qgis_pl_PL.ts: - translation update: pl by Robert and gl by Xan +Artem Popov 2013-08-27 -2012-04-28 Nathan Woodrow + Russian translation update. - * src/gui/qgsmaptoolzoom.cpp, tests/src/gui/CMakeLists.txt, - tests/src/gui/testqgsmaptoolzoom.cpp: Add fix for bad zoom using pen - PCs; Add tests +Werner Macho 2013-08-30 -2012-04-27 Juergen E. Fischer + adding new dutch translator - * src/providers/gdal/qgsgdalprovider.cpp: gdal provider: fix debug - output +Werner Macho 2013-08-30 -2012-04-27 Alexander Bruy + translation update: nl - * : update icon for touch action +pcav 2013-08-30 -2012-04-26 Alexander Bruy + More IT GUI translation - only help files missing now - * src/providers/ogr/qgsogrprovider.cpp: add ESRI FileGDB driver to - OGR drivers list +Hien TRAN-QUANG 2013-08-28 -2012-04-26 Alexander Bruy + Fix Blocker Issue #7871 : SVG Marker fill and outlin colors are restored + when changing widget or reopening style window - * : also update icons for r.mapcalc and r.mapcalculator GRASS - modules +Merge: 8c4c57b 2d163e3 +Werner Macho 2013-08-29 -2012-04-26 Alexander Bruy + Merge pull request #839 from Cracert/master + + Polish translation update - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp, src/plugins/raster_terrain_analysis/resources.qrc: Icons day. - New icon for Raster Terrain analysis plugin, thanks again Robert! +Robert Szczepanek 2013-08-30 -2012-04-26 Alexander Bruy + pl translation: vector layers properties - * src/plugins/interpolation/interpolator.qrc, - src/plugins/interpolation/qgsinterpolationplugin.cpp, - src/plugins/interpolation/qgsinterpolationplugin.h: new icon for - Interpolation plugins. Thanks, Robert! +Matthias Kuhn 2013-08-29 -2012-04-26 Alexander Bruy + [postgres] some more precision/length fixes - * : update Pan To Selected icon +Matthias Kuhn 2013-08-29 -2012-04-26 Alexander Bruy + Fix some postgres field precision and length inconsistencies - * images/images.qrc, src/app/qgisapp.cpp, src/ui/qgisapp.ui: icon - from Robert for Raster Calculator +Matthias Kuhn 2013-08-29 -2012-04-26 Alexander Bruy + [spatialite] Use QVariant::LongLong as int type consistently - * src/plugins/zonal_statistics/CMakeLists.txt, - src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp, - src/plugins/zonal_statistics/zonal_statistics.qrc: add icon created - by Robert to Zonal statistics plugin +Matthias Kuhn 2013-08-29 -2012-04-26 Alexander Bruy + Set min field precision even when hidden (Fix #8480) - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/resources.qrc: new icon from Robert for - Tile Index command +Matthias Kuhn 2013-08-29 -2012-04-25 Tim Sutton + QPyNullVariant() equals to QPyNullVariant(), qgis.core.NULL + + >>>> from qgis.core import NULL + >>>> lyr.getFeatures().next().attributes()[0] == NULL + True - * : Added anomaly images for i386 natty nightly builds that are - failing +Matthias Kuhn 2013-08-29 -2012-04-24 Etienne Tourigny + Small UI fix for "New PostGIS connection" dialog - * tests/src/core/testziplayer.cpp, tests/testdata/landsat_b1.qml, - tests/testdata/landsat_b1.tif.qml, tests/testdata/points2.qml, - tests/testdata/points3.qml: test that styles are loaded from qml - files outside zip +Merge: 84e38ca fe2f18a +Werner Macho 2013-08-28 -2012-04-24 Etienne Tourigny + Merge pull request #837 from Cracert/master + + Polish translation update - * python/core/qgsmaplayer.sip, src/core/qgsdataitem.cpp, - src/core/qgsdataitem.h, src/core/qgsmaplayer.cpp, - src/core/qgsmaplayer.h, src/core/qgsvectorlayer.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrprovider.cpp: fix .qml file loading in - /vsigzip and /vsizip items +Robert Szczepanek 2013-08-29 -2012-04-24 Etienne Tourigny + labeling, vector style - * src/core/raster/qgsrasterlayer.cpp: load default style if provider - is gdal and if no style was given +pcav 2013-08-29 -2012-04-24 Etienne Tourigny + More IT GUI translation - * src/core/qgsdataitem.cpp, tests/src/core/testziplayer.cpp: add - more QgsZipItem tests and data +Werner Macho 2013-08-28 -2012-04-24 Juergen E. Fischer + latest danish translation update - * CMakeLists.txt, debian/python-qgis.install.lenny, debian/rules, - python/CMakeLists.txt, python/pyspatialite/CMakeLists.txt, - src/app/CMakeLists.txt, src/browser/CMakeLists.txt, - src/core/CMakeLists.txt, src/core/spatialite/headers/spatialite.h, - src/core/spatialite/headers/spatialite/gaiaaux.h, - src/core/spatialite/headers/spatialite/gaiaexif.h, - src/core/spatialite/headers/spatialite/gaiageo.h, - src/core/spatialite/headers/spatialite/spatialite.h, - src/core/spatialite/headers/spatialite/sqlite3.h, - src/core/spatialite/headers/spatialite/sqlite3ext.h, - src/core/spatialite/spatialite.c, src/core/spatialite/sqlite3.c, - src/gui/CMakeLists.txt, src/helpviewer/CMakeLists.txt, - src/mapserver/CMakeLists.txt, - src/plugins/offline_editing/CMakeLists.txt, - src/providers/CMakeLists.txt, src/providers/osm/CMakeLists.txt, - src/providers/spatialite/CMakeLists.txt: bring back internal - spatialite for Debian squeeze and Ubuntu lucid, maverick, natty and - oneiric +Alexander Bruy 2013-08-28 -2012-04-24 Juergen E. Fischer + [processing] fix html in error handler text - * tests/src/core/regression1141.cpp, - tests/src/core/regression992.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsrasterlayer.cpp: test fixes on windows +Alexander Bruy 2013-08-28 -2012-04-24 Juergen E. Fischer + cleanup - * src/core/quazip/ioapi.h, src/core/quazip/unzip.c, - src/core/quazip/unzip.h, src/core/quazip/zip.c, - src/core/quazip/zip.h: quazip: fix warnings and drop OF macro +Werner Macho 2013-08-28 -2012-04-24 Tim Sutton + typo fixes for danish language - * : commit 2978bfa4cec051eb91755324f604e4665d99a2ad Author: Tim - Sutton Date: Tue Apr 24 21:52:37 2012 +0200 - -2012-04-24 Alexander Bruy - - * src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/georeferencer/qgsgeorefplugin.h: remove About dialog - from Georeferencer plugin - -2012-04-24 Alexander Bruy - - * src/plugins/roadgraph/roadgraphplugin.cpp, - src/plugins/roadgraph/roadgraphplugin.h: remove About dialog from - RoadGraph plugin as discussed in ML - -2012-04-24 Juergen E. Fischer - - * src/gui/qgsnewvectorlayerdialog.cpp, - src/providers/ogr/qgsogrprovider.cpp: fix #5481 - -2012-04-24 Juergen E. Fischer - - * CMakeLists.txt: fix spatialindex requirement - -2012-04-24 Tim Sutton - - * : Added more anomalies for nightly tests on i386 precise - -2012-04-24 Juergen E. Fischer - - * tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsrasterlayer.cpp: more test fixes on windows - -2012-04-24 Juergen E. Fischer - - * tests/src/core/regression992.cpp: fix regression992 test crash - -2012-04-23 Juergen E. Fischer - - * resources/context_help/QgsFieldCalculator-de_DE: fix german field - calculator translation - -2012-04-23 Juergen E. Fischer - - * tests/src/core/testziplayer.cpp: fix ziplayer test for GDAL<1.8 - -2012-04-23 Juergen E. Fischer - - * src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrprovider.cpp: case insensitive - vsizip/vsigzip support - -2012-04-17 Juergen E. Fischer - - * CMakeLists.txt, Doxyfile, PROVENANCE, - cmake_templates/Doxyfile.in, debian/compat.lenny, - debian/control.lenny, debian/copyright, - debian/qgis-plugin-grass-common.install.lenny, debian/rules, - ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd, python/CMakeLists.txt, - python/pyspatialite/CMakeLists.txt, src/app/CMakeLists.txt, - src/browser/CMakeLists.txt, src/core/CMakeLists.txt, - src/core/spatialindex/README, - src/core/spatialindex/include/LineSegment.h, - src/core/spatialindex/include/Point.h, - src/core/spatialindex/include/RTree.h, - src/core/spatialindex/include/Region.h, - src/core/spatialindex/include/SpatialIndex.h, - src/core/spatialindex/include/Version.h, - src/core/spatialindex/include/tools/PointerPool.h, - src/core/spatialindex/include/tools/PoolPointer.h, - src/core/spatialindex/include/tools/SmartPointer.h, - src/core/spatialindex/include/tools/Tools.h, - src/core/spatialindex/src/rtree/BulkLoader.cc, - src/core/spatialindex/src/rtree/BulkLoader.h, - src/core/spatialindex/src/rtree/Index.cc, - src/core/spatialindex/src/rtree/Index.h, - src/core/spatialindex/src/rtree/Leaf.cc, - src/core/spatialindex/src/rtree/Leaf.h, - src/core/spatialindex/src/rtree/Node.cc, - src/core/spatialindex/src/rtree/Node.h, - src/core/spatialindex/src/rtree/PointerPoolNode.h, - src/core/spatialindex/src/rtree/RTree.cc, - src/core/spatialindex/src/rtree/RTree.h, - src/core/spatialindex/src/rtree/Statistics.cc, - src/core/spatialindex/src/rtree/Statistics.h, - src/core/spatialindex/src/spatialindex/LineSegment.cc, - src/core/spatialindex/src/spatialindex/Point.cc, - src/core/spatialindex/src/spatialindex/Region.cc, - src/core/spatialindex/src/spatialindex/SpatialIndexImpl.cc, - src/core/spatialindex/src/spatialindex/SpatialIndexImpl.h, - src/core/spatialindex/src/storagemanager/Buffer.cc, - src/core/spatialindex/src/storagemanager/Buffer.h, - src/core/spatialindex/src/storagemanager/DiskStorageManager.cc, - src/core/spatialindex/src/storagemanager/DiskStorageManager.h, - src/core/spatialindex/src/storagemanager/MemoryStorageManager.cc, - src/core/spatialindex/src/storagemanager/MemoryStorageManager.h, - src/core/spatialindex/src/storagemanager/RandomEvictionsBuffer.cc, - src/core/spatialindex/src/storagemanager/RandomEvictionsBuffer.h, - src/core/spatialindex/src/tools/Tools.cc, - src/core/spatialite/headers/spatialite.h, - src/core/spatialite/headers/spatialite/gaiaaux.h, - src/core/spatialite/headers/spatialite/gaiaexif.h, - src/core/spatialite/headers/spatialite/gaiageo.h, - src/core/spatialite/headers/spatialite/spatialite.h, - src/core/spatialite/headers/spatialite/sqlite3.h, - src/core/spatialite/headers/spatialite/sqlite3ext.h, - src/core/spatialite/spatialite.c, src/core/spatialite/sqlite3.c, - src/gui/CMakeLists.txt, src/helpviewer/CMakeLists.txt, - src/mapserver/CMakeLists.txt, - src/plugins/offline_editing/CMakeLists.txt, - src/providers/CMakeLists.txt, src/providers/osm/CMakeLists.txt, - src/providers/spatialite/CMakeLists.txt: fix #4805: - drop internal spatialite and internal spatialindex - drop support for debian lenny (no system spatialindex/spatialite - there) - -2012-04-23 Tim Sutton - - * : Added anomaly files from nightly build server - -2012-04-22 Nathan Woodrow - - * : Merge pull request #129 from szekerest/master MSSQL: Fix query builder support - -2012-04-22 Juergen E. Fischer - - * python/core/qgscoordinatereferencesystem.sip, src/core/qgis.cpp, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, - src/providers/postgres/qgspgtablemodel.cpp, - tests/src/core/testqgscoordinatereferencesystem.cpp: deprecated - QgsCoordinateReferenceSystem::equals: as it might return false - eventhough the proj.4 string is equal. PROJ.4 string isn't unique to - CRSes. - -2012-04-22 Juergen E. Fischer - - * src/core/qgis.h: fix windows build - -2012-04-22 Martin Dobias - - * src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fix #5344 - - square symbol not selectable - -2012-04-22 Juergen E. Fischer - - * debian/rules, scripts/astyle-all.sh, src/app/qgisapp.h, - src/core/qgis.cpp, src/core/qgis.h, src/core/qgsdatasourceuri.cpp, - tests/qt_modeltest/dynamictreemodel.cpp, - tests/qt_modeltest/dynamictreemodel.h, - tests/qt_modeltest/modeltest.cpp, tests/qt_modeltest/modeltest.h, - tests/qt_modeltest/tst_modeltest.cpp, - tests/src/analysis/testqgsvectoranalyzer.cpp, - tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h, - tests/src/core/test_template.cpp, - tests/src/core/testcontrastenhancements.cpp, - tests/src/core/testqgscoordinatereferencesystem.cpp, - tests/src/core/testqgsexpression.cpp, - tests/src/core/testqgsmaplayer.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgspoint.cpp, - tests/src/core/testqgsvectorlayer.cpp, - tests/src/core/testziplayer.cpp, - tests/src/gui/testqgsquickprint.cpp, - tests/src/gui/testrendererv2gui.cpp, - tests/src/gui/testrendererv2gui.h: test fixes: - run xvfb in 96 dpi mode - indentation update (including tests) - fix running tests from build directory - -2012-04-21 Juergen E. Fischer - - * src/app/qgsfieldcalculator.cpp, - src/gui/qgsnewvectorlayerdialog.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/ui/qgsfieldcalculatorbase.ui: raise field precision limit to 15 +Merge: b0ed8ed 2101af5 +Werner Macho 2013-08-28 -2012-04-21 Juergen E. Fischer + Merge pull request #835 from artfwo/more-strings-fixes-in-vector-layer-properties + + More untranslatable string fixes in vector layer properties. - * src/app/qgisapp.cpp: add running GDAL/OGR version to about box +Artem Popov 2013-08-28 -2012-04-21 Werner Macho + More untranslatable string fixes in vector layer properties. - * doc/TRANSLATORS, scripts/tsstat.pl: added Translator name +Alexander Bruy 2013-08-28 -2012-04-21 Marco Hugentobler + [processing] handle loading empty models in modeler (fix #8153) - * python/plugins/db_manager/db_manager.py, - python/plugins/db_manager/dlg_about.py: Remove about dialog in db - manager +Alexander Bruy 2013-08-28 -2012-04-21 Marco Hugentobler + correctly unload Globe plugin (fix #4185) - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/tools/doAbout.py: Remove about dialog from - gdal tools +Werner Macho 2013-08-28 -2012-04-21 William Kyngesburye + translation update: dk by Jacob - * cmake/MacBundleMacros.cmake, mac/cmake/0qgis.cmake.in: handle - crssync in bundling stage +Matthias Kuhn 2013-08-28 -2012-04-21 Juergen E. Fischer + [spatialite] uniqueValues() return values instead of strings - * debian/python-qgis.install.in, debian/python-qgis.install.lenny, - debian/python-qgis.install.lucid, - debian/python-qgis.install.maverick, - debian/python-qgis.install.natty, - debian/python-qgis.install.oneiric, - debian/python-qgis.install.precise, - debian/python-qgis.install.squeeze, - debian/python-qgis.install.wheezy: followup 78c2a2b803 +Matthias Kuhn 2013-08-28 -2012-04-21 Juergen E. Fischer + Monkey patch QPyNullVariant to be represented as 'NULL' - * debian/python-qgis.install.sid: debian package: remove - pyspatialite from python-qgis +Matthias Kuhn 2013-08-28 -2012-04-21 Juergen E. Fischer + [spatialite] Represent NULL attributes as QVariant/NULL + Instead of QVariant/Invalid - * CMakeLists.txt: cmake: rename GIT to GITCOMMAND +Matthias Kuhn 2013-08-28 -2012-04-21 Juergen E. Fischer + python: represent NULL attributes as QPyNullVariant - * src/app/qgisapp.cpp, src/app/qgsclipboard.cpp, - src/app/qgsclipboard.h, src/core/qgsvectorlayer.cpp: remap attribute - by name not index on paste (fixes #5425) +Werner Macho 2013-08-28 -2012-04-20 Juergen E. Fischer + translation update: fi by Kari - * src/core/qgsapplication.cpp: 'shorten' last commit +Salvatore Larosa 2013-08-28 -2012-04-20 Juergen E. Fischer + [processing] sextante => processing renaming: fix example provider plugin - * src/core/qgsapplication.cpp, - src/core/qgscoordinatereferencesystem.cpp, src/crssync/main.cpp: - run tests with temporary copy of srs.db - sync srs.db in a single transaction +Merge: 6552638 a10c1e3 +Werner Macho 2013-08-27 -2012-04-20 Juergen E. Fischer + Merge pull request #833 from Cracert/master + + Polish translation update - * debian/rules: debian packaging: pyspatialite fix +Robert Szczepanek 2013-08-27 -2012-04-20 Juergen E. Fischer + pl translation update - * debian/rules, src/analysis/CMakeLists.txt, - src/app/CMakeLists.txt, src/browser/CMakeLists.txt, - src/core/CMakeLists.txt, src/gui/CMakeLists.txt, - src/helpviewer/CMakeLists.txt, src/providers/grass/CMakeLists.txt, - src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt, - src/python/CMakeLists.txt, tests/bench/CMakeLists.txt: use install - rpath only on apple +Werner Macho 2013-08-27 -2012-04-19 Juergen E. Fischer + translation update: pt_BR by Arthur - * src/providers/wms/qgswmsprovider.cpp: wms provider: handle content - type case insensitive +Matthias Kuhn 2013-08-27 -2012-04-19 Juergen E. Fischer + [ogr] Blacklist datetime field type for OGR provider - * debian/rules: debian packaging: set build name for cdash +Werner Macho 2013-08-27 -2012-04-19 Juergen E. Fischer + translation update: sl_SI by Joze - * ms-windows/osgeo4w/package-nightly.cmd, - src/crssync/CMakeLists.txt, src/crssync/main.cpp, - tests/src/core/CMakeLists.txt: run crssync on coordinate system test - and run osgeo4w test as nightly +Matthias Kuhn 2013-08-27 -2012-04-19 Werner Macho + [ogr] Fix date field length for native type - * doc/TRANSLATORS, i18n/qgis_gl_ES.ts: translation update: gl_ES by - Xan +Marco Hugentobler 2013-08-27 -2012-04-19 Tim Sutton + Fix transparent 1 pixel borders in raster layer, caused by rounding to int - * python/core/qgsmaplayerregistry.sip: Move deprecated tag from - addMapLayers to addMapLayer where it was originally intended to go. - Small updates to comments. +Salvatore Larosa 2013-08-27 -2012-04-19 Juergen E. Fischer + fix capture coordinate plugin: refs pull request #803 - * CMakeLists.txt, ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd, src/core/CMakeLists.txt: osgeo4w: - fix quazip support +Salvatore Larosa 2013-08-27 -2012-04-19 Juergen E. Fischer + [pyqgis-console] small fix for autocompletion bracket, also sets to False the default setting - * python/core/qgsrasterlayer.sip, python/gui/qgisinterface.sip, - src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgisappinterface.cpp, src/app/qgisappinterface.h, - src/app/qgsbrowserdockwidget.cpp, src/browser/qgsbrowser.cpp, - src/core/qgsbrowsermodel.cpp, src/core/qgsdatasourceuri.cpp, - src/core/qgsdatasourceuri.h, src/core/qgsmaplayer.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/core/raster/qgsrasterlayer.h, src/gui/qgisinterface.h, - src/mapserver/qgsremoteowsbuilder.cpp, - src/plugins/grass/qgsgrassbrowser.cpp, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassplugin.cpp, - src/providers/wms/qgswmsconnection.cpp, - src/providers/wms/qgswmsconnection.h, - src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h, - src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmssourceselect.cpp, - src/providers/wms/qgswmssourceselect.h: Revert d7e8ae18 and - d637c677c (fixes #5407, #5409 and #5410) +Merge: 97a3a4f 2398105 +Borys Jurgiel 2013-08-27 -2012-04-18 Juergen E. Fischer + Merge pull request #769 from vinayan/topol + + Fix #5181,#4761 - Ftools-Distance Matrix - * debian/changelog, debian/control.lucid, debian/control.maverick, - debian/control.natty, debian/control.oneiric, - debian/control.precise, debian/control.sid, debian/control.squeeze, - debian/control.wheezy, debian/rules: debian packaging: run tests - with xvfb and upload results to dashboard +Juergen E. Fischer 2013-08-27 -2012-04-18 Tim Sutton + fix 16f768f9 - * : commit 7bd9240efdfd049d900030a6ba63783cf0bf28a7 Author: Tim - Sutton Date: Wed Apr 18 23:02:23 2012 +0200 +Merge: e0a1d15 2800191 +Werner Macho 2013-08-27 -2012-04-18 Werner Macho + Merge pull request #832 from asiersarasua/master + + Basque translation update - * doc/TRANSLATORS: update TRANSLATORS file +asiersarasua 2013-08-27 -2012-04-18 Tim Sutton + Basque translation update - * : Added zipped shp for testing zip driver +Werner Macho 2013-08-27 -2012-04-18 Tim Sutton + translation update: ko_KR by BJ Jang - * : commit ad39a428e64c9fb6262b6bbe444ab6040b0184a2 Author: Tim - Sutton Date: Wed Apr 18 22:10:54 2012 +0200 +Marco Hugentobler 2013-08-27 -2012-04-18 Juergen E. Fischer + Consider default CRS in new shape / spatialite dialogs - * src/providers/postgres/qgspgtablemodel.cpp: postgres provider fix: - layers with incomplete geometry type/srid/pk data could not be - selected for addition +Matthias Kuhn 2013-08-27 -2012-04-18 Werner Macho + [dualview] Disable fields when ending an edit session - * doc/TRANSLATORS, i18n/qgis_ru.ts: translation update: ru by Artem +Werner Macho 2013-08-27 -2012-04-18 Werner Macho + translation update for gl, id, nl and pt_PT - * doc/TRANSLATORS, scripts/tsstat.pl: adding korean translator name +Merge: 80c9199 c6e4838 +Werner Macho 2013-08-27 -2012-04-18 Juergen E. Fischer + Merge pull request #831 from artfwo/raster-minmax-label-fix + + Untranslatable strings and formatting of the raster min/max label - * src/app/qgisapp.cpp, src/app/qgsclipboard.cpp, - src/app/qgsmaptooloffsetcurve.cpp, - src/core/composer/qgscomposerscalebar.cpp, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgsmaplayerregistry.cpp, src/core/qgsvectorlayer.cpp, - src/core/quazip/JlCompress.cpp, src/core/quazip/JlCompress.h, - src/core/quazip/README.txt, src/core/quazip/crypt.h, - src/core/quazip/ioapi.h, src/core/quazip/qioapi.cpp, - src/core/quazip/quaadler32.cpp, src/core/quazip/quaadler32.h, - src/core/quazip/quachecksum32.h, src/core/quazip/quacrc32.cpp, - src/core/quazip/quacrc32.h, src/core/quazip/quazip.cpp, - src/core/quazip/quazip.h, src/core/quazip/quazip_global.h, - src/core/quazip/quazipfile.cpp, src/core/quazip/quazipfile.h, - src/core/quazip/quazipfileinfo.h, - src/core/quazip/quazipnewinfo.cpp, src/core/quazip/quazipnewinfo.h, - src/core/quazip/unzip.c, src/core/quazip/unzip.h, - src/core/quazip/zip.c, src/core/quazip/zip.h, - src/gui/qgsmapcanvas.cpp, src/gui/qgsmaptooltouch.cpp, - src/gui/qgsmaptooltouch.h, - src/providers/mssql/qgsmssqlgeometryparser.cpp, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/postgres/qgspostgresprovider.cpp: indentation update +Artem Popov 2013-08-16 -2012-04-18 Tim Sutton + Untranslatable strings and formatting of the raster min/max label - * : commit 62482954f9a06666a8e79dfac420d841b44a0f0e Merge: fc373b3 - e1c934a Author: Tim Sutton Date: Tue Apr 17 - 16:11:48 2012 -0700 +pcav 2013-08-26 -2012-04-16 Hugo Mercier + More IT GUI translation - * src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp, - src/app/qgsclipboard.cpp, src/app/qgsclipboard.h: Make the style - copy/paste functionality closer to the geometry copy/paste - implementation +Juergen E. Fischer 2013-08-26 -2012-04-15 Hugo Mercier + show word size (32/64 bit) in about box title - * src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/ui/qgisapp.ui: Implement basic copy/paste of - styles between layers +Werner Macho 2013-08-26 -2012-04-17 Tim Sutton + translation update: sv by victor - * : Merge pull request #114 from etiennesky/providers_browser2 [FEATURE] gdal/ogr providers: optimizations and .zip / .gz file - support - fixed +Werner Macho 2013-08-26 -2012-04-17 Tim Sutton + translation update: fi by Kari - * : Added anomaly checks based on test run +Merge: b08f47d 071fa92 +Artem Popov 2013-08-26 - http://dash.orfeo-toolbox.org/testDetails.php?test=9375735&build=81442 + Merge remote-tracking branch 'upstream/master' -2012-04-17 Tim Sutton +Werner Macho 2013-08-26 - * : commit 2ad635a554d80f0717a2126dbf122c23b5a1db79 Author: Tim - Sutton Date: Tue Apr 17 23:30:37 2012 +0200 + translation update for all languages -2012-04-17 Tim Sutton +Werner Macho 2013-08-26 - * : Added anomaly for ubuntu 12.04 buffer render + reverting c9e9260d -2012-04-17 Tim Sutton +Juergen E. Fischer 2013-08-26 - * : commit 7221eaa1f33518e76394ac80ef62f9d7b9105d8b Author: Juergen - E. Fischer Date: Tue Apr 17 22:44:47 2012 +0200 + german translation update -2012-04-17 Juergen E. Fischer +Merge: f5ca533 45c5a8c +Werner Macho 2013-08-25 - * i18n/qgis_de.ts: german translation update + Merge pull request #815 from artfwo/raster-minmax-label-fix + + Untranslatable strings and formatting of the raster min/max label -2012-04-17 pcav +Merge: 58a3f01 dffd64c +Werner Macho 2013-08-25 - * i18n/qgis_it.ts: Updated IT GUI translation + Merge pull request #816 from artfwo/properties-untranslatable-tooltip + + Fix untranslatable tooltip in project properties. -2012-04-17 Werner Macho +Merge: 78264a0 3706786 +Werner Macho 2013-08-25 - * doc/TRANSLATORS, i18n/qgis_af.ts, i18n/qgis_ar.ts, - i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, - i18n/qgis_da_DK.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts, - i18n/qgis_es.ts, i18n/qgis_et_EE.ts, i18n/qgis_fa.ts, - i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_gl_ES.ts, - i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, - i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts, - i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, i18n/qgis_lo.ts, - i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts, - i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, - i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, i18n/qgis_ru.ts, - i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, - i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, i18n/qgis_ta.ts, - i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, - i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation - update: string update db_manager - -2012-04-17 Werner Macho - - * scripts/update_ts_files.sh: update TRANSLATORS with every string - update - -2012-04-17 Radim Blazek - - * python/core/qgsrasterlayer.sip, python/gui/qgisinterface.sip, - src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgisappinterface.cpp, src/app/qgisappinterface.h, - src/app/qgsbrowserdockwidget.cpp, src/browser/qgsbrowser.cpp, - src/core/qgsbrowsermodel.cpp, src/core/qgsmaplayer.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/core/raster/qgsrasterlayer.h, src/gui/qgisinterface.h, - src/mapserver/qgsremoteowsbuilder.cpp, - src/plugins/grass/qgsgrassbrowser.cpp, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassplugin.cpp, - src/providers/wms/qgswmsconnection.cpp, - src/providers/wms/qgswmsconnection.h, - src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h, - src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmssourceselect.cpp, - src/providers/wms/qgswmssourceselect.h: QgsDataSourceURI used for - WMS provider, all params are now encoded in URI, removed WMS - specific functions from QgsRasterLayer and QgisAppInterface - -2012-04-17 Radim Blazek - - * src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h: added - generic mode - -2012-04-17 Alexander Bruy - - * python/plugins/db_manager/dlg_about.py: fix About dialog in DB - Manager - -2012-04-17 Alexander Bruy - - * python/plugins/fTools/tools/doPointsInPolygon.py: fix broken - Points in polygon (fix #5389) - -2012-04-16 Werner Macho - - * i18n/qgis_pl_PL.ts: translation update: pl by polish team - -2012-04-16 Werner Macho - - * i18n/qgis_cs_CZ.ts: translation update: cz by Jan - -2012-04-16 Juergen E. Fischer - - * debian/rules: debian packaging: followup changelog rename - -2012-04-16 Marco Hugentobler - - * src/app/composer/qgscomposerscalebarwidget.cpp, - src/app/composer/qgscomposerscalebarwidget.h, - src/core/composer/qgscomposerscalebar.cpp: Fix for bug #5354 - (scalebar problems in print composer) - -2012-04-16 Giuseppe Sucameli - - * python/plugins/CMakeLists.txt, - python/plugins/db_manager/.gitignore, - python/plugins/db_manager/CMakeLists.txt, - python/plugins/db_manager/CREDITS, - python/plugins/db_manager/LICENSE, - python/plugins/db_manager/README, python/plugins/db_manager/TODO, - python/plugins/db_manager/__init__.py, - python/plugins/db_manager/completer.py, - python/plugins/db_manager/db_manager.py, - python/plugins/db_manager/db_manager_plugin.py, - python/plugins/db_manager/db_model.py, - python/plugins/db_manager/db_plugins/CMakeLists.txt, - python/plugins/db_manager/db_plugins/__init__.py, - python/plugins/db_manager/db_plugins/connector.py, - python/plugins/db_manager/db_plugins/data_model.py, - python/plugins/db_manager/db_plugins/html_elems.py, - python/plugins/db_manager/db_plugins/info_model.py, - python/plugins/db_manager/db_plugins/plugin.py, - python/plugins/db_manager/db_plugins/postgis/CMakeLists.txt, - python/plugins/db_manager/db_plugins/postgis/__init__.py, - python/plugins/db_manager/db_plugins/postgis/connector.py, - python/plugins/db_manager/db_plugins/postgis/data_model.py, - python/plugins/db_manager/db_plugins/postgis/info_model.py, - python/plugins/db_manager/db_plugins/postgis/plugin.py, - python/plugins/db_manager/db_plugins/postgis/plugins/CMakeLists.txt - , python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py, - python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/ - CMakeLists.txt, - python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/ - __init__.py, - python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/ - topoview_template.qgs, - python/plugins/db_manager/db_plugins/postgis/plugins/versioning/CMa - keLists.txt, - python/plugins/db_manager/db_plugins/postgis/plugins/versioning/Dlg - Versioning.ui, - python/plugins/db_manager/db_plugins/postgis/plugins/versioning/Dlg - Versioning_ui.py, - python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__i - nit__.py, - python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg - _versioning.py, - python/plugins/db_manager/db_plugins/postgis/resources.qrc, - python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py, - python/plugins/db_manager/db_plugins/spatialite/CMakeLists.txt, - python/plugins/db_manager/db_plugins/spatialite/__init__.py, - python/plugins/db_manager/db_plugins/spatialite/connector.py, - python/plugins/db_manager/db_plugins/spatialite/data_model.py, - python/plugins/db_manager/db_plugins/spatialite/info_model.py, - python/plugins/db_manager/db_plugins/spatialite/plugin.py, - python/plugins/db_manager/db_plugins/spatialite/resources.qrc, - python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py, - python/plugins/db_manager/db_tree.py, - python/plugins/db_manager/dlg_about.py, - python/plugins/db_manager/dlg_add_geometry_column.py, - python/plugins/db_manager/dlg_create_constraint.py, - python/plugins/db_manager/dlg_create_index.py, - python/plugins/db_manager/dlg_create_table.py, - python/plugins/db_manager/dlg_db_error.py, - python/plugins/db_manager/dlg_field_properties.py, - python/plugins/db_manager/dlg_import_vector.py, - python/plugins/db_manager/dlg_sql_window.py, - python/plugins/db_manager/dlg_table_properties.py, - python/plugins/db_manager/highlighter.py, - python/plugins/db_manager/icons/CMakeLists.txt, - python/plugins/db_manager/icons/namespaces.xpm, - python/plugins/db_manager/icons/tables.xpm, - python/plugins/db_manager/icons/user.xpm, - python/plugins/db_manager/icons/users.xpm, - python/plugins/db_manager/info_viewer.py, - python/plugins/db_manager/layer_preview.py, - python/plugins/db_manager/resources.qrc, - python/plugins/db_manager/sql_dictionary.py, - python/plugins/db_manager/table_viewer.py, - python/plugins/db_manager/ui/DlgAbout.ui, - python/plugins/db_manager/ui/DlgAddGeometryColumn.ui, - python/plugins/db_manager/ui/DlgCreateConstraint.ui, - python/plugins/db_manager/ui/DlgCreateIndex.ui, - python/plugins/db_manager/ui/DlgCreateTable.ui, - python/plugins/db_manager/ui/DlgDbError.ui, - python/plugins/db_manager/ui/DlgFieldProperties.ui, - python/plugins/db_manager/ui/DlgImportVector.ui, - python/plugins/db_manager/ui/DlgSqlWindow.ui, - python/plugins/db_manager/ui/DlgTableProperties.ui, - python/plugins/db_manager/ui/__init__.py, - src/app/qgspluginregistry.cpp: [FEATURE] add DB Manager plugin - -2012-04-16 Giuseppe Sucameli - - * src/core/qgsvectorlayerimport.cpp: import vector layer: don't - clear the error message if too many errors occur - -2012-04-16 Alexander Bruy - - * python/plugins/fTools/tools/doDefineProj.py: correctly handle user - defined CRSes (fix #5257) - -2012-04-16 Marco Hugentobler - - * src/analysis/vector/qgsgeometryanalyzer.cpp: Fix beforeVertex - - afterVertex mistake for linear referencing - -2012-04-16 pcav - - * src/app/qgsvectorlayerproperties.cpp, - src/providers/mssql/qgsmssqlprovider.cpp: Fixed minor - inconsistencies in strings (requires regenerating files for - translation) - -2012-04-16 Hugo Mercier - - * src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp, - src/app/qgsclipboard.cpp, src/app/qgsclipboard.h: Make the style - copy/paste functionality closer to the geometry copy/paste - implementation - -2012-04-16 D'Hont René-Luc - - * src/mapserver/qgsprojectparser.cpp: Using title and abstract of - vector layer in WFS capabilities - -2012-04-16 pcav - - * i18n/qgis_it.ts: Fixed IT Sponsors page - -2012-04-16 Tim Sutton - - * : Anomalies for tests so that they run on ubuntu 12.04 - -2012-04-16 Tim Sutton - - * : Anomalies for tests so that they run on ubuntu 12.04 - -2012-04-15 Giuseppe Sucameli - - * src/core/qgsvectorlayerimport.cpp: import vector layer: fix - override layer option (follow f8d5d432) - -2012-04-16 pcav - - * i18n/qgis_it.ts: More IT GUI translation + Merge pull request #830 from artfwo/master + + Russian translation update. -2012-04-16 pcav +Merge: 3706786 78264a0 +Artem Popov 2013-08-26 - * i18n/qgis_it.ts: Almost completed IT GUI translation + Merge remote-tracking branch 'upstream/master' -2012-04-16 Werner Macho +Artem Popov 2013-08-26 - * doc/TRANSLATORS, i18n/qgis_lv.ts: flag and language file fixes + Russian translation update. -2012-04-15 Juergen E. Fischer +Victor Olaya 2013-08-26 - * src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/core/qgsrasterdataprovider.h: make tests & qgis work from the - build directory (python still doesn't) + [processing] aded dual support for saga 2.1 and 2.0.8 + + several minor bugs and improvements -2012-04-15 Werner Macho +Juergen E. Fischer 2013-08-25 - * i18n/qgis_af.ts, i18n/qgis_ar.ts, i18n/qgis_bg.ts, - i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_da_DK.ts, - i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts, - i18n/qgis_et_EE.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, - i18n/qgis_fr.ts, i18n/qgis_gl_ES.ts, i18n/qgis_he.ts, - i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts, - i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts, - i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, i18n/qgis_lo.ts, - i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts, - i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, - i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, i18n/qgis_ru.ts, - i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, - i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, i18n/qgis_ta.ts, - i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, - i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation - update: fix upstream + german translation update -2012-04-15 Werner Macho +Werner Macho 2013-08-25 - * src/app/qgisapp.cpp, src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlsourceselect.cpp, - src/providers/mssql/qgsmssqlsourceselect.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/ui/qgsmssqlnewconnectionbase.ui: small typo fixes for - consistency + translation update: nl by Richard -2012-04-15 Nathan Woodrow +Merge: bb798b4 8e43791 +mhugent 2013-08-25 - * : Merge pull request #126 from szekerest/master MSSQL: Support non spatial tables in browser dock + Merge pull request #829 from mhugent/ogr_odbc_subset + + Fix subset for ODBC ogr layers -2012-04-15 pcav +Juergen E. Fischer 2013-08-25 - * : commit 8f6d9418b2235f55f3e39178804402aec37233b0 Author: pcav - Date: Sun Apr 15 21:47:32 2012 +0200 + speedup creation of spatialite database in tests -2012-04-15 Giuseppe Sucameli +pcav 2013-08-25 - * src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h: add delete layer - action to PG data items + More IT GUI translation -2012-04-15 Giuseppe Sucameli +Juergen E. Fischer 2013-08-25 - * src/providers/postgres/qgspostgresprovider.cpp: allow PG provider - to delete a layer + osgeo4w64: run Nightly instead of Experimental -2012-04-15 Tim Sutton +Juergen E. Fischer 2013-08-25 - * src/providers/gdal/qgsgdalprovider.cpp, - tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h: Better hash comparison - implementation for render checker + fix doxygen and unused warnings -2012-04-15 Werner Macho +Juergen E. Fischer 2013-08-25 - * doc/TRANSLATORS, i18n/qgis_et.ts, i18n/qgis_et_EE.ts, - images/images.qrc, scripts/tsstat.pl: fix estonian flag + indentation update -2012-04-15 Werner Macho +Juergen E. Fischer 2013-08-25 - * doc/TRANSLATORS, i18n/qgis_af.ts, i18n/qgis_ar.ts, - i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, - i18n/qgis_da_DK.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts, - i18n/qgis_es.ts, i18n/qgis_et.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, - i18n/qgis_fr.ts, i18n/qgis_gl_ES.ts, i18n/qgis_he.ts, - i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts, - i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts, - i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, i18n/qgis_lo.ts, - i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts, - i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, - i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, i18n/qgis_ru.ts, - i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, - i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, i18n/qgis_ta.ts, - i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, - i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation - update: all strings .. prepare 1.8 + remove line decoration symbol layer test (followup aaef9478) -2012-04-15 Tim Sutton +Juergen E. Fischer 2013-08-25 - * : Merge pull request #125 from lynxlynxlynx/master ignore system setup errors in the regression992 test + cleanup c++filt -2012-04-15 Juergen E. Fischer +Juergen E. Fischer 2013-08-25 - * ms-windows/osgeo4w/package-nightly.cmd: run Experimental test - target on nightly build + german translation update -2012-04-15 Werner Macho +Juergen E. Fischer 2013-08-25 - * BUGS, CHANGELOG, ChangeLog, NEWS, doc/CMakeLists.txt, - doc/changelog.html, doc/changelog.t2t, doc/news.html, doc/news.t2t, - src/app/qgsabout.cpp: rename our CHANGELOG to NEWS and add new - ChangeLog according to GNU Standards + show running GEOS version in about -2012-04-15 Juergen E. Fischer +Juergen E. Fischer 2013-08-25 - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsmaptoolnodetool.h, src/core/qgsgeometry.cpp, - src/core/qgsgeometry.h, src/core/qgsvectorfilewriter.cpp: Revert - accidentally commited parts of 6b7f594 + creatensis.pl: allow installation from other osgeo4w url and collect license texts -2012-04-15 Juergen E. Fischer +Merge: 6937e4f 6899a17 +mhugent 2013-08-24 - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsmaptoolnodetool.h, src/core/qgis.h, - src/core/qgsgeometry.cpp, src/core/qgsgeometry.h, - src/core/qgsvectorfilewriter.cpp: workaround deprecation warnings in - MSVC for GEOWkt global + Merge pull request #800 from minorua/8440 + + If ignoreShapeEncoding is false, clear SHAPE_ENCODING after creating shapefile with SHAPE_ENCODING="" (fix #8440) -2012-04-15 Alexander Bruy +Werner Macho 2013-08-24 - * src/ui/qgsoptionsbase.ui: fix typo + changes to make function help look the same -2012-03-28 Alexander Bruy +Werner Macho 2013-08-24 - * src/app/qgsrasterlayerproperties.cpp, - src/app/qgsrasterlayerproperties.h, - src/ui/qgsrasterlayerpropertiesbase.ui: remove buttons for saving - contrast enhancement, std dev. and band combination from raster - layer properties dialog + translation update: es by carlos -2012-02-11 Alexander Bruy +pcav 2013-08-23 - * src/app/qgsrasterlayerproperties.cpp, - src/core/raster/qgsrasterlayer.cpp: use standard deviations only - when requested (fix #4917) + One translator missing -2012-02-11 Alexander Bruy +pcav 2013-08-23 - * src/app/qgsoptions.cpp, src/app/qgsoptions.h, - src/ui/qgsoptionsbase.ui: move some raster settings such as std. dev - and band combination to general QGIS settings + Updated list of translators -2012-04-15 Giuseppe Sucameli +Merge: c9cf745 8aa7795 +pcav 2013-08-23 - * python/plugins/GdalTools/GdalTools.py: GdalTools: display a - friendly message when python-gdal is missing + Merge branch 'master' of github.com:qgis/Quantum-GIS -2012-04-15 Juergen E. Fischer +pcav 2013-08-23 - * src/app/qgsprojectproperties.cpp: disable projection selection in - project properties, while OTFP is off + More IT GUI translation -2012-04-15 Jaka Kranjc +Marco Hugentobler 2013-08-23 - * tests/src/core/regression992.cpp: regression992 test: only check - the actual regression this test would fail if GDAL doesn't have any jpeg2000 support - compiled in + Move subset string creation in own method to avoid code duplication -2012-04-15 Juergen E. Fischer +Marco Hugentobler 2013-08-23 - * src/app/CMakeLists.txt, src/app/qgisapp.cpp, - src/app/qgsshortcutsmanager.cpp, src/app/qgsshortcutsmanager.h: - cleaner fix for #5355: remove shortcuts to destroyed actions - automatically + Fix subset in ogr provider for ODBC driver -2012-04-15 Giuseppe Sucameli +Matthias Kuhn 2013-08-23 - * src/app/qgsrasterlayerproperties.cpp: update the "invert color" - checkbox status opening the raster propery dialog (fix #4423) + Update docstring -2012-04-15 Giuseppe Sucameli +Matthias Kuhn 2013-08-23 - * src/core/qgsvectorlayerimport.cpp: in import vector layer fix - overwrite option and report provider errors + [dualview] Remove attrs from feature dialog when deleted (Fix #8504) -2012-04-15 Tim Sutton +Marco Hugentobler 2013-08-23 - * : commit dca998f4b0514bb154739d9c5f0bc54986446411 Author: Tim - Sutton Date: Sun Apr 15 11:13:46 2012 +0200 + Fix form annotations not showing in composer -2012-04-15 Juergen E. Fischer +Merge: f8ac3a4 fc2a4a1 +Giuseppe Sucameli 2013-08-23 - * src/app/qgisapp.cpp: fix #5355: remove touch action before - registering the shortcuts list + Merge pull request #827 from slarosa/fix_6892 + + [dbmanager] skip RuntimeError: fixes #6892 -2012-04-15 Tim Sutton +Merge: 418ba87 dd0eda2 +Werner Macho 2013-08-23 - * : Added anomalies for nimbus host in test suite + Merge pull request #828 from Jean-Roc/traduction_ui + + update french translation -2012-04-15 Tim Sutton +Jean-Roc Morreale 2013-08-23 - * tests/src/core/CMakeLists.txt: Use explicit qt libs for tests + update french translation -2012-04-15 Tim Sutton +Juergen E. Fischer 2013-08-22 - * tests/src/core/testqgscoordinatereferencesystem.cpp: Fixes for - coordinate ref sys test errors on Werner's machine + debian packaging update -2012-04-14 Tim Sutton +Juergen E. Fischer 2013-08-22 - * tests/src/core/testqgscoordinatereferencesystem.cpp: Added - additional diagnostics for why stripped wkt compare is failing on - some machines. + german translation update -2012-04-14 Tim Sutton +Juergen E. Fischer 2013-08-22 - * tests/src/core/qgsrenderchecker.cpp: Don't use ugly old std::out - to send info to CDash + remove line decoration symbol layer (fixes #8379) -2012-04-14 Tim Sutton +Salvatore Larosa 2013-08-22 - * : commit aab9976b552cb2ceecbdc8ef1936a56c89645704 Author: Tim - Sutton Date: Sat Apr 14 21:50:32 2012 +0200 + [dbmanager] skip RuntimeError: fixes #6892 -2012-04-14 Richard Duivenvoorde +Merge: 1bb2725 a765b5a +mhugent 2013-08-22 - * src/app/legend/qgslegend.cpp: Set measureUnits also for - myFirstLayer (otherwise wrong scale is shown) + Merge pull request #824 from rldhont/8473 + + FIX BUG #8473 Cannot rename layers in composer legend -2012-04-14 Juergen E. Fischer +D'Hont René-Luc 2013-08-19 - * python/core/qgis.sip, python/core/qgsvectorfilewriter.sip, - src/app/qgisapp.cpp, src/core/qgsvectorfilewriter.cpp, - src/core/qgsvectorfilewriter.h: [API] fix #5014 + FIX BUG #8473 Cannot rename layers in composer legend + + If the layer is a raster layer, the layer label is not updated with the + user defined text. + If the layer is a vector layer with simple symbol the symbol label + cannot be updated and be blocked at layer name. The label can be the + symbol user label, the layer user label, the layer title or the layer + name. -2012-04-14 Martin Dobias +Salvatore Larosa 2013-08-22 - * src/app/qgsbrowserdockwidget.cpp, src/core/qgsbrowsermodel.cpp, - src/core/qgsdataitem.cpp, src/core/qgsdataitem.h: Always create - favourites item + expand the favourites item in dock widget + remove context help for mapserver export plugin: followup 441a46b -2012-04-14 Tim Sutton +Salvatore Larosa 2013-08-22 - * src/core/qgsmaplayerregistry.cpp: Fixed bug with signal being - emitted declaring layers were added but having a zero length layer - list + [pyqgis-console] sextante => processing renaming: followup ec82b52 -2012-04-14 Tim Sutton +Werner Macho 2013-08-22 - * : commit 4097ed5cbdb2eeae3907b70078d84c38faa62cf7 Author: Tim - Sutton Date: Sat Apr 14 19:06:38 2012 +0200 + translation update: no by james and es by carlos -2012-04-14 Werner Macho +Larry Shaffer 2013-08-20 - * doc/TRANSLATORS, scripts/tsstat.pl: forgot danish language + [labeling] Add local preconfigured test server unit tests class + + - Add control images for server output + - Add class for comparison against canvas output -2012-04-14 Tim Sutton +Larry Shaffer 2013-08-20 - * : Merged conflicts + Add simple local test server convenience classes for unit tests -2012-04-14 Werner Macho +Larry Shaffer 2013-08-20 - * i18n/qgis_da.ts, i18n/qgis_da_DK.ts, images/images.qrc: forgot - danish language + [labeling] Update unit test control images, features db and .qml styles -2012-04-14 Werner Macho +Larry Shaffer 2013-08-20 - * .gitignore: also ignore .qm file in i18n + [labeling] Make test font available for app, tests, server without requiring font install + + - Load test font from testdata.qrc if app or server built with ENABLE_TESTS + - Add global loading of test font in utilities.py -2012-04-14 Werner Macho +Merge: 363b5de 54b45e7 +Werner Macho 2013-08-21 - * doc/TRANSLATORS, i18n/qgis_da.ts, images/images.qrc, - scripts/tsstat.pl, src/app/qgsabout.cpp, src/app/qgsoptions.cpp, - src/ui/qgsabout.ui, src/ui/qgsoptionsbase.ui: Displaying Translators - Countries and Languages in a nicer way + Merge pull request #825 from yoichigmf/for_pull_req + + update GUI translation JA -2012-04-14 Tim Sutton +yoichigmf 2013-08-21 - * CMakeLists.txt, CTestConfig.cmake, - cmake_templates/CTestCustom.cmake.in, qgis-test.ctest.example: - Inital implementation of test submission to CDash using OTB Dash - server. Use make Experimental to submit your tests. + update GUI translation JA -2012-04-14 Tim Sutton +Werner Macho 2013-08-21 - * src/ui/qgsprojectpropertiesbase.ui: Fix wanings about duplicated - grid layout + allowing negative values in fixed buffer distance -2012-04-14 Tim Sutton +Borys Jurgiel 2013-08-20 - * : commit 5148d5f3f60bb1d994361e8b2c3039a8ada33215 Merge: 8c3f2a1 - 0a2fdb6 Author: Werner Macho Date: Sat - Apr 14 11:29:18 2012 +0200 + translation update: pl -2012-04-14 Werner Macho +Juergen E. Fischer 2013-08-20 - * : now add flags for real + followup b9b8a039: wthh? -2012-04-14 Juergen E. Fischer +Juergen E. Fischer 2013-08-20 - * debian/changelog, debian/rules: debian packaging update: switch - from test to check target for tests + fix #8488: use QgsMimeDataUtils to decode uris when dropping into db_manager -2012-04-14 Juergen E. Fischer +Matthias Kuhn 2013-08-20 - * tests/src/core/testqgscoordinatereferencesystem.cpp: show GDAL & - PROJ version in CRS test + Followup 2995bdcf: Don't iterate changed geometries twice -2012-04-14 Werner Macho +Matthias Kuhn 2013-08-20 - * images/images.qrc: inserting flags for language codes + Render added/changed features on top -2012-04-14 Tim Sutton +Alexander Bruy 2013-08-20 - * : commit 4665ac01f535f964247c1d05235e3de4d5892bc0 Author: Tim - Sutton Date: Sat Apr 14 10:55:53 2012 +0200 + [processing] drop old icon -2012-04-14 Juergen E. Fischer +Alexander Bruy 2013-08-20 - * python/analysis/analysis.sip, python/core/core.sip: Revert "fixed - two SIP warnings about deprecated syntax" as it breaks builds with - older SIP versions (Debian squeeze, Ubuntu lucid and maverick) + also update icon -2012-04-14 Tim Sutton +Alexander Bruy 2013-08-20 - * tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h: Finished first pass - implementation for anomaly testing in renderchecker. + update console for sextante renaming -2012-04-14 Tim Sutton +Alexander Bruy 2013-08-20 - * tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h, - tests/src/core/regression992.cpp, - tests/src/core/testqgsgeometry.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsrasterlayer.cpp, - tests/src/core/testqgsrenderers.cpp, - tests/testdata/control_images/expected_raster/expected_raster.png.a - ux.xml: Moved control images one per directory and updated render - checker to generate paths and filenames more cleanly. All tests pass - for me. + more fixes after sextante renaming -2012-04-13 Tim Sutton +Alexander Bruy 2013-08-20 - * : commit cfcf12f1213f9960b4ce2d163d6a9bf63905c4cf Author: Tim - Sutton Date: Fri Apr 13 18:52:32 2012 +0200 + [sextante] more import fixes -2012-04-13 Tim Sutton +Alexander Bruy 2013-08-20 - * tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h, - tests/src/core/regression992.cpp, - tests/src/core/testqgsgeometry.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsrasterlayer.cpp, - tests/src/core/testqgsrenderers.cpp: Refactored tests using control - images to get control image path from renderchecker. + [sextante] regenerate ui and resources -2012-04-13 Martin Dobias +Alexander Bruy 2013-08-20 - * : Merge pull request #121 from lynxlynxlynx/master fix for one abort and a few SIP compile warnings + [sextante] fix imports -2012-04-13 Tim Sutton +Alexander Bruy 2013-08-20 - * : Merge pull request #122 from mbernasocchi/android Android + fix CMakeLists.txt after renaming sextante -2012-04-13 Tim Sutton +Victor Olaya 2013-08-12 - * tests/src/core/qgsrenderchecker.cpp: Moved test images into their - own folder + renamed "sextante" to "processing" -2012-04-13 Marco Bernasocchi +Larry Shaffer 2013-08-19 - * src/app/qgisapp.cpp: remove the touch button if HAVE_TOUCH=0 + [labeling] Reinstate old pan icon for label placement section's icon -2012-04-13 Jaka Kranjc +Daniel Vaz 2013-08-17 - * src/app/qgisapp.cpp: addVectorLayers: return early if no layers - were succesfully added fixes an abort later on if all the layer loadings failed for some - reason, like missing the shx file for a shapefile. + Update feature count on layer modification (Fix #8445) -2012-04-13 Marco Hugentobler +Borys Jurgiel 2013-08-19 - * src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: - SCALE parameter for GetLegendGraphic + translation update: pl -2012-04-13 Jaka Kranjc +Werner Macho 2013-08-19 - * python/analysis/analysis.sip, python/core/core.sip: fixed two SIP - warnings about deprecated syntax + translation update and changes in galician language naming -2012-04-13 Marco Hugentobler +Alexander Bruy 2013-08-19 - * src/core/qgsgeometry.cpp, src/core/qgsgeometry.h: Rename variable - from beforeIndex to afterIndex + [sextante] fix handling of vectors in scripts and R providers (closes #8483) -2012-04-13 Marco Bernasocchi +Marco Hugentobler 2013-08-19 - * src/app/main.cpp: remove qsplashscreen on android + Add png8 format string for qgis server and umn -2012-04-13 Marco Hugentobler +Juergen E. Fischer 2013-08-18 - * src/mapserver/qgswmsserver.cpp: Apply patch from ticket #5348 - provided by René-Luc D'Hont + * also intialize mCalc member of QgsExpression in protected ctor (fixes #8475) + * avoid nesting ogc:Filter in ogc:Filter (createFunctionElement already returns a filter) -2012-04-12 szekerest +Juergen E. Fischer 2013-08-18 - * src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h: MSSQL: Add handling of - default values (fixes #5316) + debian packaging: disable globe plugin on sid (apparently doesn't support OSG 3.2 in sid yet) -2012-04-12 Nathan Woodrow +Juergen E. Fischer 2013-08-18 - * : Merge pull request #118 from szekerest/master Fix for issues with sql server geography type + msvc: build with multiple processes -2012-04-11 Etienne Tourigny +Radim Blazek 2013-08-18 - * CMakeLists.txt, cmake_templates/qgsconfig.h.in, - src/app/qgsoptions.cpp, src/core/CMakeLists.txt, - src/core/qgsdataitem.cpp, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/ogr/qgsogrdataitems.cpp: add detection of libz - (optional, needs update for win32) + Disable VSI cache before GDALGetOverviewCount, workaround for GDAL ticket 5170, hopefully fixes #8356 -2012-04-10 dakcarto +William Kyngesburye 2013-08-17 - * mac/cmake/3fw.cmake.in: Fix for source or build directory paths - that contain spaces. + check for bundled GRASS for gisbase on OS X -2012-04-10 dakcarto +Merge: 0b5c4eb b1bad51 +Werner Macho 2013-08-17 - * mac/cmake/2lib.cmake.in: Fix for source or build directory paths - that contain spaces. + Merge pull request #821 from asiersarasua/master + + Basque translation update -2012-04-10 dakcarto +asiersarasua 2013-08-17 - * mac/cmake/1qt.cmake.in: Fix for source or build directory paths - that contain spaces. + Basque translation update -2012-04-10 dakcarto +Werner Macho 2013-08-17 - * mac/cmake/1osg.cmake.in: Fix for source or build directory paths - that contain spaces. + translation update: fi by Kari -2012-04-10 dakcarto +Larry Shaffer 2013-08-16 - * mac/cmake/0qgis.cmake.in: Fix for source or build directory paths - that contain spaces. + Fix crash when server source select dialogs go into background on Mac -2012-04-09 dakcarto +Larry Shaffer 2013-08-16 - * python/CMakeLists.txt: Added SIP generation to build/python - directory of API files for QScintilla code completion/call tips. Signed-off-by: Tim Sutton + [labeling] Refactor unit tests so all render check tests can be inherited by all output test classes (canvas, composer, server) + + - Add openInBrowserTab function to utilities -2012-04-09 Werner Macho +Juergen E. Fischer 2013-08-16 - * i18n/qgis_et.ts: translation update: et by veiko + sync GPL with original -2012-04-09 Juergen E. Fischer +Borys Jurgiel 2013-08-16 - * src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: fix #5333 + translation update: pl -2012-04-09 Tim Sutton +Merge: 6366f5b 4957d57 +Werner Macho 2013-08-16 - * CMakeLists.txt: Added make-no-x options (experimental) for running - unit tests on a headless server. + Merge pull request #820 from Jean-Roc/traduction_ui + + update french translation -2012-04-08 Tim Sutton +Jean-Roc Morreale 2013-08-16 - * tests/src/core/testqgscoordinatereferencesystem.cpp: Better - diagnostics for CRS tests debug output + update french translation -2012-04-08 William Kyngesburye +Juergen E. Fischer 2013-08-16 - * INSTALL, doc/INSTALL.html, doc/osx.t2t, doc/style.css: OS X - install cleanup, fill in more dependencies; adjust header styles for - better readability + german translation update -2012-04-08 Tim Sutton +Alexander Bruy 2013-08-15 - * CMakeLists.txt: Added verbose output on test failure to make check - command + update to new icon (follow up 0150799e78) -2012-04-08 Tim Sutton +Werner Macho 2013-08-16 - * tests/testdata/landsat.tif.aux.xml, - tests/testdata/tenbytenraster.asc.aux.xml: Added test datasets - aux.xml files for what its worth + translation update: da_DK by Jacob -2012-04-08 Tim Sutton +Werner Macho 2013-08-16 - * scripts/remove_git_confict_files.sh, - scripts/remove_svn_conflict_files.sh: Revise script to get rid of - orig files + translation update: no by James -2012-04-08 Tim Sutton +Werner Macho 2013-08-16 - * : Replaced raster test images so all tests pass + translation update: string update for all languages -2012-04-08 Tim Sutton +Merge: 116bbff 2a4f4d6 +Nathan Woodrow 2013-08-16 - * : commit bbf471eee70f5bf24c581e9c97422843a04e878c Author: Tim - Sutton Date: Sun Apr 8 13:04:08 2012 +0200 + Merge pull request #818 from 3nids/undodigitize + + fix crash at undo in digitize -2012-04-08 Juergen E. Fischer +Merge: 4e69997 96834b2 +Werner Macho 2013-08-16 - * src/core/gps/qgsgpsdconnection.cpp: raw only won't work with GPSes - that don't speak NMEA (should fix #4050) + Merge pull request #819 from artfwo/master + + Russian translation update. -2012-04-07 William Kyngesburye +Artem Popov 2013-08-16 - * INSTALL, doc/INSTALL.html, doc/osx.t2t: OS X install update - - osgearth and globe plugin + Russian translation update. -2012-04-07 Juergen E. Fischer +Denis Rouzaud 2013-08-16 - * cmake/SIPMacros.cmake: fix #5331 + fix crash at undo in digitize -2012-04-07 William Kyngesburye +Marco Hugentobler 2013-08-16 - * CMakeLists.txt, mac/CMakeLists.txt, mac/cmake/1osg.cmake.in, - src/plugins/globe/globe_plugin.cpp: Add bundling of osg/osgEarth for - OS X app + Fix #8471 -2012-04-07 William Kyngesburye +Merge: 2046342 d10872a +mhugent 2013-08-15 - * mac/cmake/1qt.cmake.in: Don't bundle PyQwt if not present in - system + Merge pull request #817 from artfwo/save-style-window-title-fix + + Fix window title in qgssavetodbdialog.ui -2012-04-07 William Kyngesburye +Artem Popov 2013-08-16 - * mac/cmake/1qt.cmake.in: Qt bundling cleanup + Fix window title in qgssavetodbdialog.ui -2012-04-07 Tim Sutton +Artem Popov 2013-08-16 - * tests/src/core/testqgscoordinatereferencesystem.cpp: Use more - appropriate global for createFromId CRS test + Fix untranslatable tooltip in project properties. -2012-04-07 Tim Sutton +Artem Popov 2013-08-16 - * : commit 8ae8e1596c6500bece96c892eba9de99d7ba66d9 Author: Tim - Sutton Date: Sat Apr 7 14:03:18 2012 +0200 + Untranslatable strings and formatting of the raster min/max label -2012-04-07 Nathan Woodrow +Merge: 74367c5 9d19752 +Werner Macho 2013-08-15 - * src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h: - Remove/Add layers to snapping dialog. Fixes #5318 + Merge pull request #814 from slarosa/fix_8469 + + [topology-checker] skips raster layers: fixes #8469 -2012-04-07 Tim Sutton +Salvatore Larosa 2013-08-15 - * tests/testdata/maprender_testdata.qml: Update control image and - qml for map renderer test - all renderer tests now pass for me. + [topology-checker] skips raster layers: fixes #8469 -2012-04-07 Juergen E. Fischer +Marco Hugentobler 2013-08-15 - * src/app/qgisapp.cpp: fix add/remove layers connections (follows up - f9ed6d4) + Simple marker: use limit for cache image size. Fixes #8386 -2012-04-07 Tim Sutton +Nathan Woodrow 2013-08-16 - * src/core/qgscoordinatereferencesystem.cpp: Changed the way - equality tests are done in qgscoordinatereference system. Simply - comparing WKT's is not effective since the same CRS can be expressed - in different ways. Now we compare the authid (which may have some - side effects but probably less than the old system. All - qgscoordinatereferencesystem tests pass now. + Remove messageitem id -2012-04-07 Tim Sutton +Nathan Woodrow 2013-08-15 - * src/core/qgscoordinatereferencesystem.cpp, - tests/src/core/testqgscoordinatereferencesystem.cpp: 1 remaining - test fails in CRS tests + Add GUI_Export, Reorder widgets -2012-04-07 Tim Sutton +Denis Rouzaud 2013-08-15 - * src/core/qgscoordinatereferencesystem.h, - tests/src/core/testqgscoordinatereferencesystem.cpp: One CRS test - failure left + add destructor -2012-04-07 Tim Sutton +Denis Rouzaud 2013-08-09 - * tests/src/core/testqgscoordinatereferencesystem.cpp: 3 coordinate - system test failures left + more complete QgsMessageBarItem: inherits from QWidget to allow further editing -2012-04-06 Tim Sutton +Merge: 25e79f9 66a7afa +Tim Sutton 2013-08-15 - * src/core/qgscoordinatereferencesystem.cpp, - tests/src/core/qgsrenderchecker.cpp, - tests/src/core/qgsrenderchecker.h, - tests/src/core/regression1141.cpp, - tests/src/core/regression992.cpp, - tests/src/core/testqgscoordinatereferencesystem.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsvectorfilewriter.cpp: [BACKPORT] in progress - test updates / fixes + Merge pull request #698 from 3nids/svgpan + + SVG for pan icons -2012-04-06 Tim Sutton +Denis Rouzaud 2013-07-04 - * python/core/qgis.sip, src/core/qgis.h: [BACKPORT] Naming - consistency for GEOWkt global (renamed to GEOWKT) + replace pan icon by a hand, and accord panToSelected to already used colors -2012-04-06 giohappy +Merge: 58b7910 93a5879 +Nathan Woodrow 2013-08-14 - * src/core/qgsdistancearea.cpp: Update src/core/qgsdistancearea.cpp + Merge pull request #811 from 3nids/fixrubber + + fix appearance of point rubber bands at small scales -2012-04-06 Marco Hugentobler +Denis Rouzaud 2013-08-15 - * src/app/legend/qgslegend.cpp: Zoom to layer extent when adding the - first layer + fix mixing pixels and map units in calculation of update rectangle -2012-04-05 Juergen E. Fischer +Denis Rouzaud 2013-08-14 - * src/core/qgscoordinatereferencesystem.cpp: also get crs record - count readonly (follows up 9154e4e) + avoid duplication of points in rubberbands of point geometry -2012-04-04 William Kyngesburye +Juergen E. Fischer 2013-08-14 - * INSTALL, doc/INSTALL: fix bd916b1 + osgeo4w: fix install in directory with blanks (fixes #8398) -2012-04-04 William Kyngesburye +Alexander Bruy 2013-08-14 - * doc/INSTALL, doc/INSTALL.html, doc/osx.t2t: OS X install updates + [sextante] update modeller to changes in parameter vector -2012-04-05 Juergen E. Fischer +Merge: fef6e2b bc07232 +Nathan Woodrow 2013-08-14 - * src/app/legend/qgslegend.cpp, src/browser/qgsbrowser.cpp, - src/core/qgspluginlayerregistry.cpp, - src/mapserver/qgswmsserver.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp, - src/plugins/offline_editing/offline_editing.cpp, - src/plugins/spatialquery/qgsspatialquerydialog.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgsrasterlayer.cpp, - tests/src/core/testqgsrenderers.cpp, - tests/src/core/testqgsvectorlayer.cpp: indentation update + Merge pull request #810 from 3nids/fixwarning + + fix warning -2012-04-05 Tim Sutton +Denis Rouzaud 2013-08-14 - * : commit d830d537a67bc4850b069418cc06a547e6373b09 Author: Tim - Sutton Date: Thu Apr 5 00:42:08 2012 +0200 + fix warning -2012-04-05 Juergen E. Fischer +Larry Shaffer 2013-08-13 - * i18n/qgis_de.ts: german translation update + [labeling] Unit tests update + + - Fix unpacking of render check results (fix false positives) + - Push opening of report to background process for Linux + - Report all failures to one random temp HTML file + - Better HTML output for report -2012-04-04 Juergen E. Fischer +Merge: d1768b8 fcb6d64 +Salvatore Larosa 2013-08-13 - * src/core/qgsdistancearea.cpp: show acres after sq ft and before sq - mile + Merge pull request #806 from 3nids/fix8399 + + fix #8399 do not use pattern in SVG -2012-04-04 szekerest +Denis Rouzaud 2013-08-13 - * src/providers/mssql/qgsmssqlprovider.cpp: MSSQL:Improve handling - of datetime types (fixes #5283) + homgenize oracle icons -2012-04-05 Tim Sutton +Denis Rouzaud 2013-08-13 - * python/core/qgsmaplayerregistry.sip, - src/app/gps/qgsgpsinformationwidget.cpp, - src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h, - src/app/qgisapp.cpp, src/app/qgisapp.h, - src/core/qgsmaplayerregistry.cpp, src/core/qgsmaplayerregistry.h, - src/core/qgsproject.cpp: [BACKPORT] to 1.8. Further improvements to - multiple layer removal in one operation support for the registry and - apply suggested improvements from Jürgen. + do not use pattern -2012-04-04 Werner Macho +Matthias Kuhn 2013-08-13 - * i18n/qgis_es.ts: translation update: es by Carlos + [SIP] Change all occurences of convert[From|To]Instance to convert[From|To]Type + Removal of these deprecated calls is expected to improve stability -2012-04-04 Juergen E. Fischer +Radim Blazek 2013-08-13 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - use same precision in st_makeenvelope and BOX3D + correctly delete last digitized point, fixes #8462 -2012-04-03 Marco Hugentobler +Alexander Bruy 2013-08-13 - * src/app/legend/qgslegend.cpp: Avoid multiple redraws if loading - projects + remove mapserver_export plugin (manual merge for pull-request 642) -2012-04-03 Juergen E. Fischer +Radim Blazek 2013-08-13 - * CMakeLists.txt: don't use -Wl,--no-undefined on OSX + Disable VSI cache before GDALRasterIO, workaround for GDAL ticket 5170, fixes #8356 -2012-04-03 Juergen E. Fischer +Larry Shaffer 2013-08-12 - * debian/changelog, debian/qgis-providers-common.postinst: debian - packaging update + [labeling] Unit test cleanup and add ability to output reports on bad render checks to web browser -2012-04-02 Juergen E. Fischer +Nyall Dawson 2013-08-13 - * CMakeLists.txt, cmake/FindProj.cmake, - src/plugins/grass/CMakeLists.txt, - src/providers/grass/CMakeLists.txt, - src/providers/grass/qgsgrassprovider.cpp, - src/providers/grass/qgsgrassprovider.h, - src/providers/grass/qgsgrassprovidermodule.cpp, - src/providers/grass/qgsgrassprovidermodule.h, - src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt: move - grassprovider to grass library (might fix #3999) + Fix indexOf checks in setDisplayField, make sure they are case insensitive -2012-04-02 Marco Hugentobler +Nyall Dawson 2013-08-13 - * src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: Fix - check/unchek of groups in TOC (ticket #5013) + Make sure updateFields() is called before setDisplayField for new vector layers (fix #8311) -2012-04-02 Etienne Tourigny +Nathan Woodrow 2013-08-13 - * src/providers/ogr/qgsogrdataitems.cpp: skip .shp.xml and .aux.xml - files in ogrdataitem + Set alpha for rubber bands. Fix #8463 -2012-03-25 Etienne Tourigny +Larry Shaffer 2013-08-12 - * src/app/qgsoptions.cpp, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/ogr/qgsogrdataitems.cpp, src/ui/qgsoptionsbase.ui: add - option to bypass dataset scanning in browser dock + [pluginmanager] Fix horizontal stretch of vertical tabs sidebar -2012-03-24 Etienne Tourigny +Chris Crook 2013-08-13 - * images/images.qrc, src/app/qgsoptions.cpp, - src/core/qgsdataitem.cpp, src/core/qgsdataitem.h, - src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrprovider.cpp, src/ui/qgsoptionsbase.ui: add - support for reading datasets inside zip file in browser using quazip + Fixing potential infinite loop when rescanning file too early and + removing unnecessary multiple rescans as file is progressively updated -2012-03-24 Etienne Tourigny +Richard Duivenvoorde 2013-06-09 - * src/core/CMakeLists.txt, src/core/quazip/COPYING, - src/core/quazip/JlCompress.cpp, src/core/quazip/JlCompress.h, - src/core/quazip/README.txt, src/core/quazip/crypt.h, - src/core/quazip/ioapi.h, src/core/quazip/qioapi.cpp, - src/core/quazip/quaadler32.cpp, src/core/quazip/quaadler32.h, - src/core/quazip/quachecksum32.h, src/core/quazip/quacrc32.cpp, - src/core/quazip/quacrc32.h, src/core/quazip/quazip.cpp, - src/core/quazip/quazip.h, src/core/quazip/quazip_global.h, - src/core/quazip/quazipfile.cpp, src/core/quazip/quazipfile.h, - src/core/quazip/quazipfileinfo.h, - src/core/quazip/quazipnewinfo.cpp, src/core/quazip/quazipnewinfo.h, - src/core/quazip/unzip.c, src/core/quazip/unzip.h, - src/core/quazip/zip.c, src/core/quazip/zip.h: add quazip for zip - file read support + purge olde PluginInstallerDialog context help + + there will be a new QgsPluginManager help file -2012-03-24 Etienne Tourigny +Matthias Kuhn 2013-08-12 - * src/app/qgisapp.cpp, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrprovider.cpp: add preliminary support for - GDAL/OGR VSIFileHandler (.zip and .gz files) - full support requires - new QgsCollectionItem class + Fix some minor messagebar issues -2012-03-24 Etienne Tourigny +Juergen E. Fischer 2013-08-07 - * src/app/qgisapp.cpp, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdaldataitems.h, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h: cache gdal sublayers list for - subsequent access + update for visual c++ 2010: + * use shorter target names for python plugins + * add build scripts for 64bit + * use nircmd in postinstall -2012-04-02 Juergen E. Fischer +Alexander Bruy 2013-08-12 - * src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h: open CRS database readonly - by default (fixes permission timeouts on windows) + correct handling for non ASCII characters in plugin installer (fix #8452) -2012-04-01 szekerest +Alexander Bruy 2013-08-12 - * src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/mssql/qgsmssqldataitems.h, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h: Improve handling of - estimated metadata (fixes #5227 fixes #5252) + fix copying to clipboard in fTools (closes #8442) -2012-04-01 Marco Hugentobler +Matthias Kuhn 2013-08-12 - * src/app/qgsprojectproperties.cpp, - src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h, src/mapserver/qgswmsserver.cpp, - src/mapserver/qgswmsserver.h, src/ui/qgsprojectpropertiesbase.ui: - [FEATURE]: possibility to set MaxWidth and MaxHeight for GetMap - request + Get rid of compiler warnings -2012-04-01 Marco Hugentobler +Werner Macho 2013-08-12 - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Fix direction for - eventLayer offset + translation update: hu by Zoltan -2012-04-01 Werner Macho +Nathan Woodrow 2013-08-12 - * i18n/qgis_af.ts, i18n/qgis_ar.ts, i18n/qgis_bg.ts, - i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, - i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_et.ts, - i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, - i18n/qgis_gl_ES.ts, i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, - i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, - i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, - i18n/qgis_lo.ts, i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, - i18n/qgis_nl.ts, i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, - i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, - i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, - i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, - i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, - i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, - i18n/qgis_zh_TW.ts: translation update: string update for all - languages on request + Fix #7012 -2012-03-31 Giuseppe Sucameli +Minoru Akagi 2013-08-12 - * src/app/qgisapp.cpp, src/app/qgsattributeactiondialog.cpp, - src/core/qgsattributeaction.cpp, src/python/qgspythonutils.h, - src/python/qgspythonutilsimpl.cpp, src/python/qgspythonutilsimpl.h, - src/ui/qgsattributeactiondialogbase.ui: [FEATURE] allow multiline - feature actions + If ignoreShapeEncoding is false, clear SHAPE_ENCODING after creating shapefile with SHAPE_ENCODING="" (fix #8440) + Spit: apply SHAPE_ENCODING to shape layer opening -2012-04-01 Tim Sutton +Larry Shaffer 2013-08-08 - * src/core/qgsmaplayerregistry.cpp, src/core/qgsmaplayerregistry.h: - [API] Added registry support for addition and removal of multiple - layers in one operation (and notification thereof). Maintains API - compatibility with single layer add/remove operations. + [labeling] Initial python unittest setup and some tests + + - Note: some tests will fail until differences in platform dpi are worked out -2012-03-31 Juergen E. Fischer +Merge: 58477fe 0d34eb1 +Werner Macho 2013-08-11 - * src/analysis/vector/qgsgeometryanalyzer.h, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgssearchstringparser.yy, - src/plugins/grass/qtermwidget/Screen.cpp, - src/plugins/heatmap/heatmapgui.cpp: fix warnings + Merge pull request #801 from yoichigmf/work_translation + + translation update: ja by Yoichi -2012-03-31 Tim Sutton +yoichigmf 2013-08-11 - * src/analysis/vector/qgsgeometryanalyzer.cpp: Mark unused var + update GUI translation JA -2012-03-31 Marco Hugentobler +Werner Macho 2013-08-11 - * src/analysis/vector/qgsgeometryanalyzer.cpp: Intendention update - and remove legacy code + translation update: es by Carlos -2012-03-31 Marco Hugentobler +Salvatore Larosa 2013-08-10 - * : commit dd9b98a1b338dcb6278d97368444e86835cc4ca3 Author: Marco - Hugentobler Date: Sat Mar 31 - 22:10:04 2012 +0200 + [pyqgis-console] fixes translation strings: avoids UnicodeEncode error -2012-03-31 Juergen E. Fischer +Salvatore Larosa 2013-08-10 - * i18n/qgis_de.ts: german translation update + [pyqgis-console] more encoding fix. -2012-03-31 Juergen E. Fischer +Victor Olaya 2013-08-09 - * src/app/main.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.h, - src/plugins/georeferencer/qgsleastsquares.cpp: fix gcc 4.7 - warnings/errors + [sextante] edited/added saga descriptions -2012-03-31 Tim Sutton +Werner Macho 2013-08-09 - * : Merge pull request #112 from mbernasocchi/android Android goodies (touch maptool, with-touch mode, ui edits, ...) + translation update: da_DK and es -2012-03-31 Tim Sutton +Juergen E. Fischer 2013-08-09 - * : commit 785f9ae0ccb4a079a0a3184418695ee524a61470 Author: Etienne - Tourigny Date: Sun Mar 25 23:25:33 2012 - -0300 + german translation update -2012-03-26 Etienne Tourigny +Artem Popov 2013-08-07 - * src/core/qgsbrowsermodel.cpp, src/core/qgsdataitem.cpp: sort items - in browser dock: sort items by type, so directories are before data - items, sort top-level provider items by name Signed-off-by: Tim Sutton + Fix untranslatable strings in qgsstylev2managerdialog.cpp -2012-03-24 Etienne Tourigny +pcav 2013-08-09 - * images/images.qrc: add missing icons for raster and vector - collections in themes/default Signed-off-by: Tim Sutton + Updated list of IT translators -2012-03-24 Etienne Tourigny +Merge: 2087de1 c1cde94 +Nathan Woodrow 2013-08-08 - * src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h, - src/ui/qgsbrowserlayerpropertiesbase.ui, - src/ui/qgsrasterlayerpropertiesbase.ui: add simple layer properties - dialog to browser dock (source, provider and metadata) ; ui tweaks - in raster properties dialog Signed-off-by: Tim Sutton + Merge pull request #798 from 3nids/maptoolcapturerubber + + [fix #8395] Add a second rubber band in map tool capture -2012-03-24 Etienne Tourigny +Nyall Dawson 2013-08-09 - * src/app/qgsbrowserdockwidget.cpp: browser: add collapse all button Signed-off-by: Tim Sutton + Add note that non-greedy regular expressions are not supported to function help -2012-03-24 Etienne Tourigny +pcav 2013-08-08 - * src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h, - src/core/qgsdataitem.cpp: browser and dataitems - show wait cursor - when loading Signed-off-by: Tim Sutton + More IT GUI translation -2012-03-31 Tim Sutton +Denis Rouzaud 2013-08-08 - * src/app/legend/qgsapplegendinterface.cpp, - src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h, - src/core/qgscoordinatereferencesystem.cpp, - src/gui/qgslegendinterface.h: [BACKPORT] Api update - added signlas - for legend events and made them available to plugin api. Patch - courtesy of Etienne Tourigny and closes - pull request 107 + set pen/brush style for rubber band + + alpha channel for color of digitizing rubber band + + second rubberband to distinguish drawn vertices from next possible point in digitization -2012-03-30 Etienne Tourigny +Salvatore Larosa 2013-08-08 - * src/core/qgscoordinatereferencesystem.cpp: prefer non-deprecated - crses (fixes #4355) + [ftools] fix export/add geometry tool: refresh attributes map -2012-03-30 Juergen E. Fischer +Matthias Kuhn 2013-08-08 - * debian/compat.sid, debian/compat.wheezy: fix nightly debian build + Split feature tool: Feedback in the messagebar instead of QMessageBox -2012-03-30 Alexander Bruy +Werner Macho 2013-08-08 - * python/plugins/fTools/tools/doDefineProj.py: better wording for - error message + translation update: another kr update -2012-03-30 Tim Sutton +Matthias Kuhn 2013-08-08 - * src/app/qgsmaptooloffsetcurve.cpp: Mark unused variables to - prevent compiler warnings if using older geos. + [attrtable] Dismiss cached data when column is removed (Fix #8405) -2012-03-29 Juergen E. Fischer +Alexander Bruy 2013-08-08 - * ms-windows/osgeo4w/qgis.bat.tmpl: Revert 02749e9 (will be fixed in - GDAL package). + [sextante] fix obtaining vector layers -2012-03-29 Juergen E. Fischer +Merge: b88b76b 0523e89 +alexbruy 2013-08-08 - * ms-windows/osgeo4w/qgis.bat.tmpl: osgeo4w: set GDAL_DRIVER_PATH - again (GDAL looks in apps/qgis-dev/bin/gdalplugins otherwise) + Merge pull request #760 from ddanielvaz/partial-fix-7708 + + Partial fix for #7708 -2012-03-29 Juergen E. Fischer +Merge: 6fe077c 25c4337 +alexbruy 2013-08-08 - * src/app/qgisapp.cpp, src/app/qgisapp.h: fix srs validation from - threads + Merge pull request #755 from ddanielvaz/fix-4189 + + Fix #4189 -2012-03-27 Juergen E. Fischer +Werner Macho 2013-08-08 - * src/analysis/raster/qgsrastercalcparser.yy, - src/plugins/heatmap/heatmapgui.cpp, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqltablemodel.cpp, - src/providers/postgres/qgspgtablemodel.cpp, - src/ui/qgsfieldcalculatorbase.ui, - src/ui/qgsnewogrconnectionbase.ui, - src/ui/qgsprojectpropertiesbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui: fix warnings + translation updates: fi, kr, and new translator added -2012-03-27 Juergen E. Fischer +Merge: 1a18fba a523fa5 +Werner Macho 2013-08-08 - * debian/changelog, debian/compat.sid, debian/compat.wheezy, - debian/control.sid, debian/control.squeeze, debian/control.wheezy, - debian/copyright: debian packaging update + Merge pull request #792 from lynxlynxlynx/master + + Translation update, combobox fix and triviality -2012-03-29 Alexander Bruy +Salvatore Larosa 2013-08-08 - * python/plugins/fTools/tools/doDefineProj.py: fix #5257 + [dbmanager] set columns tab as default in edit table widget (before was indexes tab) -2012-03-29 Radim Blazek +Merge: 1e28ce5 34344c5 +Werner Macho 2013-08-08 - * src/providers/grass/qgsgrass.cpp, - src/providers/grass/qgsgrassprovider.cpp, - src/providers/grass/qgsgrassprovider.h: faces + Merge pull request #797 from Jean-Roc/master + + update frenchu translation -2012-03-28 Marco Bernasocchi +Merge: 41f8abb 001ad12 +alexbruy 2013-08-08 - * src/app/qgisapp.h: added TODO find a better default fontsize adding suggestion to how to detect font size + Merge pull request #791 from alexbruy/annotation-dialog + + set HTML annotation dialog title (fix #8414) -2012-03-20 Marco Bernasocchi +Nyall Dawson 2013-08-08 - * src/app/qgsoptions.cpp, src/core/qgsvectorlayer.cpp: defaulting to - symbology V1 on android (workaround to - http://hub.qgis.org/issues/5170) + Fix regexp_substr expression to correctly return only first matched group, not entire matched string -2012-03-01 Marco Bernasocchi +Nathan Woodrow 2013-08-08 - * src/app/qgsattributetabledialog.cpp, - src/ui/qgsattributetabledialog.ui: added close button to attribute - table + Follow up for Fix #8411 -2012-02-29 Marco Bernasocchi +Nathan Woodrow 2013-08-08 - * src/plugins/compass/compass.cpp: removing qDebug() from compass - plugin + Fix #8411 + + Suppress warnings for setNamedColour. + Warnings reneder composer unusable on windows, even for testing reasons. -2012-02-29 Marco Bernasocchi +Merge: 113e6fb e63aaa0 +MORREALE Jean-Roc 2013-08-07 - * images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/gui/CMakeLists.txt, src/gui/qgsmapcanvas.cpp, - src/gui/qgsmapcanvas.h, src/gui/qgsmaptool.cpp, - src/gui/qgsmaptool.h, src/gui/qgsmaptooltouch.cpp, - src/gui/qgsmaptooltouch.h, src/ui/qgisapp.ui: adding touch maptool - that allows panning, pinch zooming, double tap zoomWithCenter, - twofinger tap zoomOut fixed toolbar button functionality + Merge pull request #2 from haubourg/master + + contribution de traduction pour le QgS labeling GUI -2012-02-23 Marco Bernasocchi +Salvatore Larosa 2013-08-07 - * CMakeLists.txt: adding a touch mode if qt >=4.6 (allows qt5) this - defaults to on for android and to off for the rest. can be requested - by -DWITH_TOUCH allow qt 5 + [pyqgis-console] encoding to utf-8 when open or save a script file: again fixes for non-ascii chars -2012-03-28 Tim Sutton +Régis Haubourg 2013-08-07 - * src/app/qgspluginregistry.cpp: [BACKPORT] Enable gdaltools by - default on all platforms + update fr translation labeling gui -2012-03-28 Tim Sutton +Alexander Bruy 2013-08-07 - * : commit 5333b7479a7f78e5bc9cd8a7a26dfcbcd4d3c5fd Author: Tim - Sutton Date: Wed Mar 28 23:02:38 2012 +0200 + skip NaN values when calculating zonal statistics -2012-03-28 Etienne Tourigny +Nathan Woodrow 2013-08-07 - * python/plugins/fTools/tools/doVectorGrid.py, - python/plugins/fTools/tools/frmVectorGrid.ui: ftools vector grid: - UI improvements + Remove ERDAS EULA for now. Will be added on release -2012-03-28 Etienne Tourigny +Salvatore Larosa 2013-08-07 - * python/plugins/fTools/tools/doVectorGrid.py, - python/plugins/fTools/tools/frmVectorGrid.ui: ftools vector grid: - Align extents and resolution to selected raster layer + [pyqgis-console] small fix for non-ascii chars -2012-03-27 szekerest +Nathan Woodrow 2013-08-07 - * src/providers/mssql/qgsmssqlprovider.cpp: Use forward only cursor - in all queries + Don't hardcode alpha in rubberband -2012-03-27 szekerest +Nathan Woodrow 2013-08-07 - * src/providers/mssql/qgsmssqlprovider.cpp: Do not abort if sp_pkeys - is not working + Add ERDAS ECW licence terms. New licence tab in about dialog -2012-03-27 szekerest +Denis Rouzaud 2013-08-07 - * src/providers/mssql/qgsmssqlprovider.cpp: Determine whether - there's an integer column with unique values that can be used as a - pkey + add menu entry for select by expression -2012-03-27 szekerest +Marco Hugentobler 2013-08-07 - * src/providers/mssql/qgsmssqlprovider.cpp: Exclude the geometry - column when identifying the type + Mapserver: fix automatic normalisation of layer bbox (invalid bbox must stay invalid) -2012-03-27 szekerest +Merge: 6149b3a 86a0da0 +Werner Macho 2013-08-06 - * src/providers/mssql/qgsmssqlprovider.cpp: Retrieve the primary key - column when opening MS SQL tables and no identity column has been - specified + Merge pull request #793 from 3nids/typo + + typo -2012-03-28 Marco Hugentobler +Denis Rouzaud 2013-08-07 - * src/mapserver/CMakeLists.txt, src/mapserver/qgssldparser.cpp, - src/mapserver/qgssldrenderer.cpp, src/mapserver/qgssldrenderer.h, - src/mapserver/qgssldrule.cpp, src/mapserver/qgssldrule.h: Remove old - SLD files in QGIS server + typo -2012-03-28 Marco Hugentobler +Merge: 020ed2c 7608faf +Nyall Dawson 2013-08-06 - * : commit 145a18477bcbe4d17d0c52cd565000c1789e75c5 Author: Marco - Hugentobler Date: Wed Mar 28 - 13:17:14 2012 +0200 + Merge pull request #789 from nyalldawson/bug8192 + + Fix bounding box calculation for features with NULL geometry (fixes #8192, #8194) -2012-03-28 Marco Hugentobler +Jaka Kranjc 2013-08-06 - * src/mapserver/qgssldparser.cpp, src/mapserver/qgssldparser.h: Use - new symbology SLD import for QGIS server + doc/TRANSLATORS: added myself to the list + + was "only" in CONTRIBUTORS before -2012-03-28 Tim Sutton +Jaka Kranjc 2013-08-06 - * resources/context_help/QgsVectorLayerProperties-en_US: Minor - english cleanups for action help + i18n: slovenian ellipsis is "non-contact" unless used for an unfinished word -2012-03-28 Giuseppe Sucameli +Jaka Kranjc 2013-08-06 - * resources/context_help/QgsVectorLayerProperties-en_US: Improve - "Actions" section in vector layer properties context help Signed-off-by: Tim Sutton + i18n: slovenian translation update (not full) -2012-03-28 Tim Sutton +Jaka Kranjc 2013-08-06 - * : commit 516fc7eb2d0077b6280cfe80973f4a4cdf93e0b7 Author: Giuseppe - Sucameli Date: Wed Mar 28 03:04:34 2012 - +0200 + QgsDecorationGridDialog: fixed the "Horizontal and Vertical" option + + It was set with a lowercase v and then checked with an uppercase one: + qgsdecorationgriddialog.cpp:57: tr( "Horizontal and vertical" ) ); + qgsdecorationgriddialog.cpp:145: else if ( text == tr( "Horizontal and Vertical" ) ) + + The lowercase variant is newer when you check the translation files - nobody + has it translated without also having the uppercase one too. -2012-03-28 Giuseppe Sucameli +Jaka Kranjc 2013-08-05 - * src/app/qgsattributeactiondialog.cpp, - src/app/qgsattributeactiondialog.h, - src/ui/qgsattributeactiondialogbase.ui: feature actions: new button - to add some default actions + FindQsci: removed the unused exception holder variable + + master didn't build without that: + -- Found PyQt4 version: 4.10 + File "~/carina/Quantum-GIS/cmake/FindQsci.py", line 41 + except ImportError, e: + ^ + SyntaxError: invalid syntax -2012-03-27 Tim Sutton +Alexander Bruy 2013-08-06 - * : commit eef6f538c0ff381566184ebe526d8bca4ff16a3e Author: Tim - Sutton Date: Tue Mar 27 11:10:53 2012 +0200 + set HTML annotation dialog title (fix #8414) -2012-03-26 szekerest +Werner Macho 2013-08-06 - * src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h: MSSQL provider: Remove the - dependency from sqlext.h + translation update: no by james -2012-03-25 Juergen E. Fischer +Alexander Bruy 2013-08-06 - * src/core/qgsattributeaction.h: QgsAttributeAction::expandAction - still in use - drop deprecation + [sextante] update algorithms to changes in ParameterVector -2012-03-25 Juergen E. Fischer +Alexander Bruy 2013-08-06 - * src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h, - src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/mssql/qgsmssqlsourceselect.cpp, - src/providers/mssql/qgsmssqltablemodel.cpp, - src/providers/mssql/qgsmssqltablemodel.h, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspgtablemodel.h, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: fix support for - multigeometries in postgres and mssql provider + [sextante] allow to select multiple geometry types for ParameterVector -2012-03-25 Juergen E. Fischer +Minoru Akagi 2013-07-18 - * python/core/qgsrect.sip, src/core/qgsrectangle.cpp, - src/core/qgsrectangle.h, src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h: wms server: improve inverted axis - handling for WMS 1.3 + OgrProvider: fix query encoding issues -2012-03-25 Juergen E. Fischer +Régis Haubourg 2013-08-06 - * ms-windows/osgeo4w/qgis.bat.tmpl: osgeo4w: don't set - GDAL_DRIVER_PATH + Revert "minor fr ui translation" + + This reverts commit 73142defece5bb47f32af3aca9d322d266c5ebd9. -2012-03-24 Tim Sutton +Matthias Kuhn 2013-08-06 - * src/ui/qgsoptionsbase.ui: Fix margin issues on digitizing tab of - options dialog (reset from 9 to 0 all around). Set scrollbox frame - style to noframe + Memory provider iterator: setFields on filtered requests + ... so QGIS doesn't crash on name based lookups of attributes -2012-03-24 Juergen E. Fischer +Salvatore Larosa 2013-08-06 - * src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/mssql/qgsmssqlgeometryparser.cpp, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h: fix warnings in mssql - provider + [ftools] fix polygon from layer extent tool: + with the "Calculate extent for each feature separately" option ticked, it generates a python error. -2012-03-24 Alexander Bruy +Merge: 018e958 73142de +Werner Macho 2013-08-05 - * src/app/qgsclipboard.cpp, src/app/qgsclipboard.h, - src/app/qgsoptions.cpp, src/ui/qgsoptionsbase.ui: [FEATURE] option - to avoid WKT copying from attribute table (fix 4591) + Merge pull request #790 from haubourg/master + + minor fr ui translation -2012-03-24 Juergen E. Fischer +Régis Haubourg 2013-08-05 - * i18n/qgis_de.ts, src/plugins/heatmap/heatmap.cpp, - src/plugins/heatmap/heatmapgui.cpp: heatmap cleanups: - don't crash when there is no layer at all - don't translate debug messages - add german translations + minor fr ui translation + + My first commit using github, please tell me if something is not done + correctly. régis -2012-03-18 Arunmozhi +Borys Jurgiel 2013-08-04 - * src/plugins/heatmap/heatmap.cpp, src/plugins/heatmap/heatmap.h, - src/plugins/heatmap/heatmapgui.cpp, - src/plugins/heatmap/heatmapgui.h, - src/plugins/heatmap/heatmapguibase.ui: merge pull request #104: - redesigned the dialog, added a options for - weighted buffer - - raster size - moved the advanced stuff under advancedGroupBox - finished the GUI code - finally heatmap hits v0.2 Users can now - specify the rows and columns for the raster - specify the cell size of the raster - Choose a field as weight for each point - Choose a field to act as the buffer radius for each point - Buffer radius can be specified in real-world units like meters & - mapunits - indentation updated + [Plugin Installer] fix #8410 -2012-03-24 Nathan Woodrow +Merge: 53e6d8c 9292333 +Jürgen Fischer 2013-08-04 - * src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wms/qgswmsdataitems.cpp: Use 'New Connection...' - instead of 'New...' for browser data items + Merge pull request #643 from rduivenvoorde/optionalcleanups + + Optional cleanups -2012-03-24 Nathan Woodrow +nyalldawson 2013-08-04 - * src/providers/mssql/qgsmssqlprovider.cpp: Fix typo in MS SQL - FreeTDS driver name + Skip missing geometries when calculating extent (fixes #8192, #8194) -2012-03-23 Juergen E. Fischer +nyalldawson 2013-08-04 - * i18n/qgis_de.ts: german translation update + Return minimal QgsRectangle as boundingBox if geometry not available, since QgsRectangle(0,0,0,0) may be a valid bounding box for some geometries -2012-03-23 Juergen E. Fischer +Merge: e76fc95 21fcfd1 +Werner Macho 2013-08-04 - * src/gui/qgsmanageconnectionsdialog.cpp, - src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/mssql/qgsmssqldataitems.h, - src/providers/mssql/qgsmssqlgeometryparser.cpp, - src/providers/mssql/qgsmssqlnewconnection.cpp, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h, - src/providers/mssql/qgsmssqlsourceselect.cpp, - src/providers/mssql/qgsmssqltablemodel.cpp: indentation update + Merge pull request #787 from Jean-Roc/master + + update fr ui -2012-03-23 Juergen E. Fischer +Merge: 834c5ab 3720feb +MORREALE Jean-Roc 2013-08-04 - * debian/changelog, debian/libqgis{QGIS_ABI}.lintian-overrides, - debian/qgis-providers.install, qbrowser.1, qgis.1: debian packaging - update - -2012-03-22 Juergen E. Fischer + Merge pull request #1 from msemchaoui/msemchaoui_branche + + MàJ_traductionQGIS2_Mehdi - * src/app/qgsmaptooloffsetcurve.cpp, src/mapserver/qgswfsserver.cpp: - fix warnings - -2012-03-23 Marco Hugentobler - - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Add offset parameters to - eventLayer functions +Nathan Woodrow 2013-08-04 -2012-03-23 Nathan Woodrow + Add tooltips for expression builder. Fix #7978 - * : Merge MS SQL provider support. Funded by Digital Mapping - Solutions (Australia) completed by Tamas Szekeres Also includes initial drag and drop support for PostGIS +Larry Shaffer 2013-08-03 -2012-02-06 szekerest + Switch targets staged_[plugin_dir_name] to staged-[plugin_dir_name], as noted in comments + + - Only plugin directories should have underscores, targets should have hyphens - * CMakeLists.txt, cmake_templates/qgsconfig.h.in, doc/CONTRIBUTORS, - images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/gui/qgsmanageconnectionsdialog.cpp, - src/gui/qgsmanageconnectionsdialog.h, src/providers/CMakeLists.txt, - src/providers/mssql/CMakeLists.txt, - src/providers/mssql/qgsmssqldataitems.cpp, - src/providers/mssql/qgsmssqldataitems.h, - src/providers/mssql/qgsmssqlgeometryparser.cpp, - src/providers/mssql/qgsmssqlnewconnection.cpp, - src/providers/mssql/qgsmssqlnewconnection.h, - src/providers/mssql/qgsmssqlprovider.cpp, - src/providers/mssql/qgsmssqlprovider.h, - src/providers/mssql/qgsmssqlsourceselect.cpp, - src/providers/mssql/qgsmssqlsourceselect.h, - src/providers/mssql/qgsmssqltablemodel.cpp, - src/providers/mssql/qgsmssqltablemodel.h, src/ui/qgisapp.ui, - src/ui/qgsmssqlnewconnectionbase.ui: Adding the native MSSQL - provider +Larry Shaffer 2013-08-03 -2012-03-22 Juergen E. Fischer + [dbmanager] Add missing InvalidDataException import - * src/providers/spatialite/qgsspatialiteprovider.cpp: fix - QgsSpatiaLiteProvider::uniqueValues, when there is a subset string +Larry Shaffer 2013-08-03 -2012-03-22 Juergen E. Fischer + [dbmanager] Fix settings default and Python type for connection with postgis plugin + + - Saved connections with empty password raised a QPyNullVariant parameter error due to lack of str default - * src/gui/qgsfieldvalidator.cpp: fix #5203 +Larry Shaffer 2013-08-03 -2012-03-22 Juergen E. Fischer + [dbmanager] Fix non-clickable checkbox in Null column when creating table (on Mac) + + - Switch from checkbox delegate to Qt::CheckStateRole for column + - Enable all triggers for table view - * i18n/qgis_de.ts: german translation update +Merge: 0367182 4cb5d04 +volaya 2013-08-03 -2012-03-22 Juergen E. Fischer + Merge pull request #784 from ricardogsilva/sextante_issue_8407 + + Fix for issue #8407 - Allow selecting between file or directory when using a File Parameter in the modeler - * src/app/qgsmaptoolfeatureaction.cpp, - src/app/qgsvectorlayerproperties.cpp, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgsexpression.cpp, src/core/raster/qgscolorrampshader.cpp, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp, - src/core/symbology-ng/qgslinesymbollayerv2.cpp, - src/core/symbology-ng/qgsmarkersymbollayerv2.cpp, - src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2registry.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgssinglesymbolrendererv2.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.h, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/mapserver/qgssldparser.h, src/mapserver/qgswfsserver.cpp: - indentation update and a few unused parameter warnings fixes +msemchaoui 2013-08-03 -2012-03-19 Juergen E. Fischer + MàJ_traductionQGIS2_Mehdi - * ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd, python/pyspatialite/CMakeLists.txt, - src/plugins/offline_editing/CMakeLists.txt: switch to external - spatialite on osgeo4w +ricardogsilva 2013-08-03 -2012-03-21 Marco Hugentobler + added the possibility to choose between file or folder for File Parameters in the modeller - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Add possibility to force - eventLayer features to single geometry type +Nathan Woodrow 2013-08-03 -2012-03-20 Marco Hugentobler + Add schema for mssql when setting where clause - * src/app/qgsprojectproperties.cpp, src/core/qgsgeometry.cpp, - src/core/qgsgeometry.h, src/mapserver/CMakeLists.txt, - src/mapserver/qgis_map_serv.cpp, src/mapserver/qgsconfigparser.h, - src/mapserver/qgshttprequesthandler.cpp, - src/mapserver/qgshttprequesthandler.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h, - src/mapserver/qgsrequesthandler.h, src/mapserver/qgssldparser.h, - src/mapserver/qgswfsserver.cpp, src/mapserver/qgswfsserver.h, - src/ui/qgsprojectpropertiesbase.ui: [FEATURE]: Add WFS support for - QGIS server. Provided by René-Luc D'Hont +Nathan Woodrow 2013-08-03 -2012-03-19 pcav + Add __iter__ for QgsFeature - * src/plugins/grass/modules/v.drape.qgm, - src/plugins/grass/modules/v.extrude.attr.qgm, - src/plugins/grass/modules/v.extrude.fixed.qgm: Fixed v.extrude and - v.drape GRASS modules +Juergen E. Fischer 2013-08-03 -2012-03-19 Juergen E. Fischer + german translation update - * src/app/gps/qgsgpsinformationwidget.cpp: apply #5121 +Artem Popov 2013-08-02 -2012-03-18 Marco Hugentobler + Correct window title in the export error messagebox. - * src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp: - Restrict input type for zonal statistics to gdal rasters for now - (switch to use QgsRasterDataProvider in the mid term) +Artem Popov 2013-08-02 -2012-03-18 Marco Hugentobler + Add plural form in QgsMessageBar - * src/analysis/vector/qgszonalstatistics.cpp, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp: Fix for - zonal statistics (ticket #4972) +Artem Popov 2013-07-30 -2012-03-16 Giuseppe Sucameli + Russian translation update. - * src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Append - Filter tag to Rule tag when exporting Categorized/Graduated - rendererV2 to SLD doc (fix #5191) +Artem Popov 2013-07-30 -2012-03-15 Juergen E. Fischer + Fix untranslatable string in QgsRasterDataProvider - * src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, - src/mapserver/qgsconfigparser.cpp, src/mapserver/qgswmsserver.cpp, - src/providers/wms/qgswmsprovider.cpp: WMS 1.3: better detection of - inverted axis +Artem Popov 2013-07-29 -2012-03-15 Alexander Bruy + Russian translation update. - * python/plugins/fTools/tools/doPointsInPolygon.py: also count - points that intersects polygon bounds (fix #5163) +Werner Macho 2013-08-03 -2012-03-14 Giuseppe Sucameli + change window title - * src/core/qgsattributeaction.cpp: fix memory leak instantiating - QgsExpression in actions +Salvatore Larosa 2013-08-02 -2012-03-14 Giuseppe Sucameli + [ftools][fix #8390] fix typo - * src/core/qgsattributeaction.cpp: convert $currfield (was %%) - running actions from "Identify actions" tool +Salvatore Larosa 2013-08-02 -2012-03-12 Giuseppe Sucameli + [dbmanager] avoid double extension when exports to file a table - * src/app/qgsmaptoolfeatureaction.cpp: "Run feature action" tool - does the action for all the matching features (fix #5126) +Salvatore Larosa 2013-08-02 -2012-03-12 Juergen E. Fischer + [pyqgis-console][fix #8392] automatically removes the redundant char when autoclosing brackets option is enabled - * src/app/qgisapp.cpp, src/gui/qgsexpressionbuilderwidget.cpp: fix - crash on quit +Juergen E. Fischer 2013-08-02 -2012-03-12 Juergen E. Fischer + Update 'Add WMS Layer...' to 'Add WMTS/WMTS Layer...' (followup d1de07a2) + and finish german translation + + -- + perl -0777 -i.bak -pe 's#Add WMS Layer...(\s+#Add WMS/WMTS Layer...$1 type="unfinished">#' i18n/qgis_*.ts + perl -i.bak -pe 's#Add WMS Layer...#Add WMS/WMTS Layer...#' i18n/qgis_*.ts - * python/core/qgscomposeritem.sip, - src/app/composer/qgscomposeritemwidget.cpp, - src/core/composer/qgscomposeritem.h, - src/plugins/georeferencer/qgsgeorefplugingui.cpp: fix - QgsComposerItem API +Matthias Kuhn 2013-08-02 -2012-03-12 Tim Sutton + Fix possible crash on exit - * src/core/raster/qgscolorrampshader.cpp, - src/core/raster/qgscolorrampshader.h: [BACKPORT] Formatting changes - only for raster color ramp shader class +Werner Macho 2013-08-02 -2012-03-11 Giuseppe Sucameli + translation update: da by Jacob - * python/plugins/GdalTools/tools/doBuildVRT.py: BuildVRT: set input - layer list when tool starting (follow d6ea1a03). Thanks Etienne for - the patch. +Juergen E. Fischer 2013-08-02 -2012-03-10 Giuseppe Sucameli + fix #8396 - * python/plugins/GdalTools/tools/doBuildVRT.py, - python/plugins/GdalTools/tools/widgetBuildVRT.ui, - python/plugins/GdalTools/tools/widgetPluginBase.py: refresh BuildVRT - command when input layers changes, cleanup (follow 9da5d0345) +Matthias Kuhn 2013-08-01 -2012-03-08 Etienne Tourigny + Fix QgsVectorLayer::EditType API doc - * python/plugins/GdalTools/tools/doBuildVRT.py, - python/plugins/GdalTools/tools/widgetBuildVRT.ui: allow to use - loaded layers as input files (instead of file selector) for - GDALTools Build Virtual Raster +Merge: 7c312f8 efd84bd +Giuseppe Sucameli 2013-08-01 -2012-03-09 Juergen E. Fischer + Merge pull request #780 from slarosa/db_manager_fix + + Small fix for DB Manager - * src/providers/wms/qgswmssourceselect.cpp: remove geoimage austria - wms server +Salvatore Larosa 2013-07-31 -2012-03-09 Etienne Tourigny + [dbmanager] set focus to SQL query TextEdit and change to ScrollToPixel the result query area - * src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp: - QgisApp::askUserForGDALSublayers : fix order of new layers in the - layers dock ; add an option to load all sublayers of a GDAL raster - with subdatasets +Werner Macho 2013-07-31 -2012-03-09 Etienne Tourigny + translation update - * src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h: - browser dock: add selected layers via context menu and tool button +Merge: 200fae7 d7119f0 +Werner Macho 2013-07-31 -2012-03-09 Etienne Tourigny + Merge pull request #766 from imincik/slovak + + Slovak translation update. - * src/core/qgsdataitem.cpp, - src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp: fixes for browser (GDAL - rasters) : skip *.aux.xml files ; add suffix to raster file names in - browser ; add HDF4 file suffix (.hdf) in - buildSupportedRasterFileFilterAndExtensions() +Marco Hugentobler 2013-07-31 -2012-03-09 Marco Hugentobler + Fix point displacement in print (ticket #8377) - * src/app/qgisapp.cpp: Fix for crash when quiting QGIS (ticket - #5145) +Marco Hugentobler 2013-07-31 -2012-03-09 Juergen E. Fischer + Quote layer names in raster calculator - * src/providers/ogr/qgsogrprovider.cpp: use GDAL_FIX_ESRI_WKT in - QgsOgrProvider::crs (fixes #5066 with GDAL 1.9) +pcav 2013-07-31 -2012-03-09 Juergen E. Fischer + More IT GUI translation - * i18n/qgis_de.ts, src/app/qgsvectorlayerproperties.cpp, - src/gui/qgsexpressionbuilderwidget.cpp: fix for some translations - and expression function help +Merge: b9c9ec4 3aad6df +Nathan Woodrow 2013-07-30 -2012-03-09 Juergen E. Fischer + Merge pull request #779 from ajdunlap/patch-1 + + Call QCoreApplication.processEvents() after writing to Python console. Fix #8343 - * python/core/qgscomposeritem.sip, scripts/spelling.dat, - src/core/composer/qgscomposeritem.h: fix typos +Alexander J. Dunlap 2013-07-30 -2012-03-09 Juergen E. Fischer + Update console_output.py + + Call QCoreApplication.processEvents() after writing to Python console, enabling incremental output from Python scripts. Fixes #8343. - * src/core/symbology-ng/qgsrendererv2registry.h: fix windows build +Borys Jurgiel 2013-07-30 -2012-03-09 Juergen E. Fischer + [Plugin Installer] Don't forget about plugins in QGIS-PLUGINPATH env variable. Fix #8376 - * debian/control.precise, debian/rules: debian packaging update +Marco Hugentobler 2013-07-30 -2012-03-09 Alexander Bruy + Server: apply project related labeling settings - * python/plugins/fTools/tools/doMergeShapes.py: fix #5097 +Matthias Kuhn 2013-07-30 -2012-03-08 Juergen E. Fischer + [ogr] Rename columns with non-unique name (Fix #8385) - * debian/changelog, debian/control.precise: debian packageing - update: add globe plugin to ubuntu precise +Matthias Kuhn 2013-07-30 -2012-03-08 pcav + Followup for 8414345 + Remove unreleased code - * : commit dabd59b134dfced4aa21671cdc9ab50e7e60d3ba Author: Juergen - E. Fischer Date: Thu Mar 8 15:55:37 2012 +0100 +Victor Olaya 2013-07-30 -2012-03-08 pcav + [sextante] made parameter harcoded in saga shapestogrid algorithm - * src/plugins/grass/modules/default.qgc: Added a module +Matthias Kuhn 2013-07-30 -2012-03-08 pcav + Doc for editor widget types - * src/plugins/grass/modules/v.extrude.attr.qgm, - src/plugins/grass/modules/v.extrude.fixed.qgm: [FEATURE] Added - v.extrude GRASS module Note: also added r.stats in a previous commit +Marco Hugentobler 2013-07-30 -2012-03-08 pcav + Fix rounding in composer item text width calculation - * src/plugins/grass/modules/r.external.qgis.qgm: Minor edit to - r.external grass module +Matthias Kuhn 2013-07-30 -2012-03-08 pcav + [symbology] Markerline does not crash on empty lines (Fix #8381) - * src/plugins/grass/modules/r.external.all.qgm, - src/plugins/grass/modules/r.external.qgis.qgm, - src/plugins/grass/modules/r.external.qgm, - src/plugins/grass/modules/r.in.gdal.loc.qgm, - src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm, - src/plugins/grass/modules/r.in.gdal.qgis.qgm, - src/plugins/grass/modules/r.in.gdal.qgm, - src/plugins/grass/modules/v.in.ogr.all.loc.qgm, - src/plugins/grass/modules/v.in.ogr.all.qgm, - src/plugins/grass/modules/v.in.ogr.loc.qgm, - src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm, - src/plugins/grass/modules/v.in.ogr.qgis.qgm, - src/plugins/grass/modules/v.in.ogr.qgm: Cleanup and improvements to - r.external, r.in.gdal, and v.in.ogr GRASS modules +Merge: 812d1ed 6fce142 +Nathan Woodrow 2013-07-29 -2012-03-08 Giuseppe Sucameli + Merge pull request #765 from 3nids/rightclickdigitize + + right click ends digitizing without adding a vertex - * src/app/qgsvectorlayerproperties.cpp, src/core/qgsexpression.cpp, - src/core/qgsexpression.h, src/core/qgsmaplayer.cpp, - src/core/qgsmaplayer.h, src/core/qgsvectorlayer.cpp, - src/core/qgsvectorlayer.h, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.h, - src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.h, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.h, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h, - src/core/symbology-ng/qgslinesymbollayerv2.cpp, - src/core/symbology-ng/qgslinesymbollayerv2.h, - src/core/symbology-ng/qgsmarkersymbollayerv2.cpp, - src/core/symbology-ng/qgsmarkersymbollayerv2.h, - src/core/symbology-ng/qgspointdisplacementrenderer.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.h, - src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrendererv2registry.cpp, - src/core/symbology-ng/qgsrendererv2registry.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/core/symbology-ng/qgssinglesymbolrendererv2.cpp, - src/core/symbology-ng/qgssinglesymbolrendererv2.h, - src/core/symbology-ng/qgssymbollayerv2.cpp, - src/core/symbology-ng/qgssymbollayerv2.h, - src/core/symbology-ng/qgssymbollayerv2registry.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.h, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.h, - src/core/symbology-ng/qgssymbolv2.cpp, - src/core/symbology-ng/qgssymbolv2.h, - src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp, - src/core/symbology-ng/qgsvectorfieldsymbollayer.h: [FEATURE] - load/save layer style (new symbology) from/to SLD document This is a huge commit, but it's mostly new functions. It changes - only few lines on the existing code. - add conversion between QgsExpression and OGC Filter Encoding 1.1 - add conversion between QgsRendererV2 and OGC Symbology Encoding - 1.1 Work done for Regione Toscana-SIGTA +Denis Rouzaud 2013-07-25 -2012-03-07 Juergen E. Fischer + right click ends digitizing without adding a vertex - * src/core/qgsexpression.cpp, src/core/qgsexpression.h, - src/core/qgsexpressionlexer.ll, src/core/qgsexpressionparser.yy, - src/gui/qgsexpressionbuilderwidget.cpp: fix #5132 +Merge: a13cdf8 eeaa867 +Nathan Woodrow 2013-07-29 -2012-03-07 Marco Hugentobler + Merge pull request #776 from Oslandia/issue7926 + + - fix #7926 - * src/app/legend/qgslegend.cpp: Fix wrong extent after loading - project files with embedded groups +Juergen E. Fischer 2013-07-29 -2012-03-07 Juergen E. Fischer + osgeo4w: update to grass 6.4.3 - * src/plugins/grass/qgsgrassregion.cpp: catch transformation - exceptions in QgsGrassRegionEdit::transform +Larry Shaffer 2013-07-29 -2012-03-07 Juergen E. Fischer + [sextante] fix duplicate plugin install target build error - * src/core/composer/qgscomposeritem.h, - src/core/composer/qgscomposerlabel.h: composer api doxygen fixes +Matthias Kuhn 2013-07-29 -2012-03-07 Juergen E. Fischer + Drag and drop editor: Don't crash with hidden field (Fix #8380) - * debian/changelog, debian/compat.hardy, debian/compat.intrepid, - debian/compat.jaunty, debian/compat.karmic, debian/control.hardy, - debian/control.intrepid, debian/control.jaunty, - debian/control.karmic, debian/rules: debian packaging update: drop - hardy, intrepid, jaunty and karmic +Alexander Bruy 2013-07-29 -2012-03-06 Juergen E. Fischer + [sextante] add example provider code - * debian/changelog, debian/control.wheezy, debian/rules: debian - packaging update: add wheezy and use internal spatialite where - libspatialite3 not available +Larry Shaffer 2013-07-29 -2012-03-06 Juergen E. Fischer + Fix some more icon path warnings - * i18n/qgis_de.ts: german translation update +vmora 2013-07-29 -2012-03-06 Alexander Bruy + - fix #7926 + - the painting is ended if image cannot be allocated in renderer - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/frmGeometry.ui: [FEATURE] fTools: allow - to calculate extent not only for whole layer but for individual - features too +Matthias Kuhn 2013-07-28 -2012-03-06 Juergen E. Fischer + Switch from deprecated sip*Instance* calls to sip*Type* calls + Min SIP version 4.8 - * src/providers/postgres/qgspostgresconn.cpp: fix warning +Merge: 8b41570 9cabd33 +Nathan Woodrow 2013-07-28 -2012-03-06 Juergen E. Fischer + Merge pull request #773 from slarosa/fix_8366 + + Fix #8366 - * src/gui/qgsexpressionbuilderwidget.cpp: expression builder: only - fetch geometry when required (and available) +Salvatore Larosa 2013-07-28 -2012-03-06 Juergen E. Fischer + [pyqgis-console] remove unused code - * src/gui/qgsquerybuilder.cpp: fix #2766 +Salvatore Larosa 2013-07-28 -2012-03-05 Juergen E. Fischer + Fix #8366 - * src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresprovider.cpp: postgresql provider: - don't require access to geometry_columns +Juergen E. Fischer 2013-07-28 -2012-03-05 Juergen E. Fischer + fix a3c1326 - * debian/changelog, debian/compat.precise, debian/control.precise, - debian/rules: debian packaging update +Juergen E. Fischer 2013-07-28 -2012-03-05 Marco Hugentobler + add install of missing API headers - * src/analysis/CMakeLists.txt: Add more analysis header to install +Juergen E. Fischer 2013-07-28 -2012-03-04 Marco Hugentobler + use gdb only for crash reports (followup e4fed741) - * src/mapserver/qgshttprequesthandler.cpp, - src/mapserver/qgswmsserver.cpp: [FEATURE]: support PNG 8Bit for - GetMap in QGIS server +Larry Shaffer 2013-07-28 -2012-03-04 pcav + Fix some icon path warnings - * src/plugins/grass/modules/default.qgc, - src/plugins/grass/modules/r.stats.qgm: Added r.stats grass module +Juergen E. Fischer 2013-07-27 -2012-03-03 pcav + remove qgis.xpm from images.qrc (followup 8b5f22eef) - * src/plugins/grass/modules/r.slope.qgm: Added option to r.slope - grass module +Juergen E. Fischer 2013-07-27 -2012-03-02 Gary Sherman + debugging improvements - * src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp, - src/ui/qgisapp.ui: Make the capitalization of menu items and tools - consistent in the main window and layer popup UI. +Juergen E. Fischer 2013-07-27 -2012-03-02 Marco Hugentobler + labeling: fix missing fonts warning - * src/app/qgsmaptooloffsetcurve.cpp: Fix compile error +Juergen E. Fischer 2013-07-27 -2012-03-02 Marco Hugentobler + - fix runtime gui warnings + - remove xpms + - also use qgis-icon-60x60.png as window icon on linux - * src/app/qgisapp.cpp: Avoid multiple redraws when loading projects +Juergen E. Fischer 2013-07-27 -2012-03-02 Marco Hugentobler + raise Qt dependency to 4.5 - * src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: WMS - server: create rendercontext to find out visible features +Juergen E. Fischer 2013-07-26 -2012-03-02 Marco Hugentobler + qgsexpression: lazy initialization of geometry calculator - * src/core/symbology-ng/qgspointdisplacementrenderer.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.h: Use - symbolsForFeature in point displacement renderer +Victor Olaya 2013-07-27 -2012-03-02 Marco Hugentobler + [sextante] fixed proximity algorithm. + + modified wrong test model - * src/mapserver/qgswmsserver.cpp: WMS featureinfo: use - willRenderFeature instead of symbolForFeature +Victor Olaya 2013-07-27 -2012-03-02 Tim Sutton + [sextante]renamed wrong saga description file - * python/core/qgscomposershape.sip: [BACKPORT] added more missing - python bindings for composer api +Radim Blazek 2013-07-27 -2012-03-02 Tim Sutton + Workaround for GDAL ticket 5170, fixes #8356 - * : commit ad955e26bf9fe7281c286c18b3b41fde6846b3bd Author: Martin - Dobias Date: Fri Mar 2 00:06:02 2012 +0100 +Nathan Woodrow 2013-07-27 -2012-03-01 Marco Hugentobler + Clean up return from form Python init function - * src/app/qgisapp.cpp, src/app/qgsmaptooloffsetcurve.cpp: Disable - offset curve if geos version < 3.3 +Larry Shaffer 2013-07-26 -2012-03-01 pcav + Initialize bool for showing label drop shadow debug rectangles - * src/plugins/grass/modules/r.mask.qgm: Adder option to r.mask GRASS - module +Larry Shaffer 2013-07-26 -2012-03-01 Alexander Bruy + Fix help viewer bundled lib path on Mac with symlink - * python/plugins/fTools/tools/doGeometry.py: fix geometry column - export when used calculation on ellipsoid +Juergen E. Fischer 2013-07-26 -2012-03-01 Tim Sutton + fix vc warnings - * : commit 8459b5834f9100f3adf9375f04cbe3428a186c8b Author: Juergen - E. Fischer Date: Wed Feb 29 22:37:19 2012 +0100 +vinayan 2013-07-26 -2012-02-29 Juergen E. Fischer + fix distance matrix k and k-1 issue - * src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgsmaptooloffsetcurve.cpp, src/core/qgsgeometry.cpp, - src/core/qgslabel.cpp, src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmssourceselect.cpp: fix warnings +Matthias Kuhn 2013-07-26 -2012-02-29 Nathan Woodrow + Dismiss render cache when selection is modified (Fix #8346) - * src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.cpp: Replace New - with 'New Connection' in browser context menu New... implied - creating a new spatiaLite database, which is not the case. +Nathan Woodrow 2013-07-26 -2012-02-29 Marco Hugentobler + Keep the return value of Python init function alive while form open - * src/app/qgsmaptooloffsetcurve.cpp: Remove comment +Tim Sutton 2013-07-26 -2012-02-29 Marco Hugentobler + Python formatting cleanups for zonal stats and raster layer tests - * : commit 9a9ab73b61ed0a433f244d657c71742270cdd04f Author: Radim - Blazek Date: Tue Feb 28 21:29:17 2012 - +0100 +Tim Sutton 2013-07-26 -2012-02-28 Marco Hugentobler + Small optimisation for zstats so that we dont do more expensive geoemtry operation when we know that cell value is null already. - * src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h, - src/app/composer/qgscomposerpicturewidget.cpp, - src/app/composer/qgscomposerpicturewidget.h, - src/ui/qgscomposerpicturewidgetbase.ui: Delay loading of composer - picture preview icons until widget is shown +Ivan Mincik 2013-07-26 -2012-02-28 Tim Sutton + Slovak translation update. - * python/core/qgscomposerlabel.sip, - src/core/composer/qgscomposerlabel.h: Added missing composer label - alignment bindings to python api and better api docs. +Juergen E. Fischer 2013-07-25 -2012-02-28 Tim Sutton + partly revert 1d5712c4 - * python/core/qgscomposeritem.sip, - src/core/composer/qgscomposeritem.h: [BACKPORT] Nicer api for - composer item frames and carry docs through to sip. +D'Hont René-Luc 2013-07-12 -2012-02-28 Tim Sutton + [QGIS-Server] Add vectorJoins + + Vector joins is based on qgsMapLayerRegistry. Vector joins has to be + used for getFeatureInfo and getMap WMS Server Request and for + describeFeatureType and getFeature WFS Server Request. - * : commit cda3693d584e02d076a4b28a6570af75d5c425db Author: Nathan - Woodrow Date: Sat Feb 25 15:34:39 2012 - +1000 +Nathan Woodrow 2013-07-25 -2012-02-27 Juergen E. Fischer + Change colour of snap marker to make it easier to see - * src/gui/qgsprojectionselector.cpp: fix crash in CRS selection +Nathan Woodrow 2013-07-25 -2012-02-27 Juergen E. Fischer + Fix missing alpha picker - * i18n/qgis_de.ts: german translation update +Nyall Dawson 2013-07-25 -2012-02-24 Tim Sutton + Also set focus to text box after double clicking lists in vector field dialog - * : Merge pull request #96 from mbernasocchi/android Android right click using TapAndHoldGesture +Werner Macho 2013-07-24 -2012-02-24 pcav + translation update: sv by victor - * src/plugins/grass/modules/r.aspect.qgm, - src/plugins/grass/modules/r.slope.qgm: Simplify slope and aspect - GRASS modules +Werner Macho 2013-07-24 -2012-02-24 Marco Hugentobler + translation update: vietnamese - * src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsconfigparser.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h, src/mapserver/qgswmsserver.cpp: - Server: set selection color prior to each render +Werner Macho 2013-07-24 -2012-02-24 Marco Hugentobler + translation update: czech by Jan - * src/app/qgsmaptooloffsetcurve.cpp: Offset curve tool: snap to - segment, not to vertex and segment +Merge: 382e300 09b6bf9 +Werner Macho 2013-07-24 -2012-02-24 Marco Hugentobler + Merge pull request #764 from imincik/slovak + + Slovak translation update. - * src/app/qgsmaptooloffsetcurve.cpp: Catch offset errors +Ivan Mincik 2013-07-24 -2012-02-24 pcav + Slovak translation update. - * src/plugins/grass/modules/v.random.qgm: Improved v.random GRASS - module +Marco Hugentobler 2013-07-24 -2012-02-24 pcav + Fix double layer space in GetLegendGraphic and remove code redundancy - * src/plugins/grass/modules/v.surf.rst.qgm: More options for the - v.surf GRASS module +Merge: 0e55d55 a1632d9 +Werner Macho 2013-07-23 -2012-02-24 Tim Sutton + Merge pull request #763 from SrNetoChan/master + + PT_pt GUI Translation - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgssymbolv2.h: Added some comments explaining - how alpha works +Nyall Dawson 2013-07-24 -2012-02-24 Marco Hugentobler + Set focus to expression text box after double clicking lists in expression builder widget - * python/core/qgscomposition.sip, src/app/composer/qgscomposer.cpp, - src/app/composer/qgscomposer.h, - src/core/composer/qgscomposition.cpp, - src/core/composer/qgscomposition.h, src/gui/qgscomposerview.cpp: Fix - lazy restore of composer maps from xml +SrNetoChan 2013-06-03 -2012-02-24 Juergen E. Fischer + PT_pt GUI Translation - * src/core/qgsvectorlayer.cpp: fix #5000 +Nathan Woodrow 2013-07-23 -2012-02-24 pcav + Revert "Delete rubberband if deactivating capture tool" Fix #8348 + + This reverts commit b5a5264c7fcf165d9c2a8dc48db180ea6f9e8fb6. - * src/plugins/grass/modules/v.surf.bspline.qgm, - src/plugins/grass/modules/v.surf.idw.qgm: Improved v.surf GRASS - modules. +Werner Macho 2013-07-23 -2012-02-23 Juergen E. Fischer + translation update: es by carlos - * src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmsprovider.h, - src/providers/wms/qgswmssourceselect.cpp, - src/ui/qgswmssourceselectbase.ui: [FEATURE] allow to specify - FEATURE_COUNT for WMS GetFeatureInfo +Victor Olaya 2013-07-23 -2012-02-23 Juergen E. Fischer + [sextante] file selector and iterator buttons can be hidden now in parameters dialog if algorithm does not support them - * debian/changelog, debian/qbrowser.desktop, debian/qgis.desktop, - debian/qgis.install: debian packaging update +Victor Olaya 2013-07-23 -2012-02-23 pcav + [sextante] fixed error introduced in fields calculator - * i18n/qgis_it.ts: Typo +Werner Macho 2013-07-23 -2012-02-23 pcav + translation update: nb_NO by James - * src/plugins/grass/modules/v.surf.idw.qgm: Improved v.surf.idw - GRASS module +Merge: 5c2e3f3 82deaae +Werner Macho 2013-07-23 -2012-02-23 Marco Hugentobler + Merge pull request #762 from sbrunner/typo-fr + + Typo in qgis_fr.ts - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h: Offset curve tool: convert - multiline features in both directions +Stéphane Brunner 2013-07-23 -2012-02-16 Marco Bernasocchi + Typo in qgis_fr.ts - * src/app/qgisapp.cpp, src/app/qgisapp.h: Fixed Right click support - using TapAndHold gesture +Victor Olaya 2013-07-23 -2012-02-09 Marco Bernasocchi + [sextante]fixed preprocessing of parameters - * src/app/qgisapp.cpp, src/app/qgisapp.h: initial right click - support +Victor Olaya 2013-07-23 -2012-02-22 Werner Macho + [sextante] fixes in saga algs an models - * i18n/qgis_es.ts: translation update: es by Carlos +Victor Olaya 2013-07-23 -2012-02-22 Marco Hugentobler + added modeler-only tools to simplified classification - * src/app/qgsmaptooloffsetcurve.cpp: Offset curve: add empty field - values to newly created features +Victor Olaya 2013-07-23 -2012-02-22 Marco Hugentobler + [sextante] added preprocessing of input params for saga algorithms - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h: Force geometry copy in offset curve - tool if control key pressed +Werner Macho 2013-07-23 -2012-02-22 Marco Hugentobler + translation update: es, fi, ko_KR thanks to contributors - * src/plugins/spit/qgsspit.cpp: Sort schema list in SPIT plugin. - Patch provided by Horst Duester +Merge: 5ea75bd c7ca40a +Jürgen Fischer 2013-07-23 -2012-02-22 Nathan Woodrow + Merge pull request #761 from minorua/label_enc + + fix an encoding issue of QgsPalLabeling (fix #8347) - * src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgsattributetabledialog.cpp: Set delete feature dialog - parent. Fixes #5062 +Minoru Akagi 2013-07-23 -2012-02-21 Marco Hugentobler + fix an encoding issue of QgsPalLabeling (fix #8347) - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h: Show snap vertex marker for offset - curve +Daniel Vaz 2013-07-22 -2012-02-21 Marco Hugentobler + Partial fix #7708 - * src/app/qgsmaptooloffsetcurve.cpp, src/app/qgsoptions.cpp, - src/ui/qgsoptionsbase.ui: Add options for offset curve (join style, - quadseg, mitre limit) +Juergen E. Fischer 2013-07-22 -2012-02-21 Juergen E. Fischer + symbology-ng: restore rotation (followup 1d5712c) - * src/app/qgisapp.cpp, src/app/qgsbrowserdockwidget.cpp, - src/providers/gdal/qgsgdaldataitems.cpp: fix #5062 and apply rest of - #5041 +Juergen E. Fischer 2013-07-22 -2012-02-21 Marco Hugentobler + symbology-ng: fix data defined properties of centroid fill markers (fixes #8318) - * src/app/qgisapp.cpp, src/app/qgsmaptooloffsetcurve.cpp: Activation - of OffsetCurve tool +Juergen E. Fischer 2013-07-22 -2012-02-21 Marco Hugentobler + allow debug messages with backtrace on linux - * images/images.qrc, src/ui/qgisapp.ui: Icon for offset curve tool +Juergen E. Fischer 2013-07-22 -2012-02-21 Marco Hugentobler + symbology-ng: make dump() methods const - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h: Snap to all visible layers with - default vertex search tolerance (but to vertex and segment) +Juergen E. Fischer 2013-07-22 -2012-02-21 Juergen E. Fischer + QgsCredentials: fix sip bindings + dbmanager: QgsCredentials is in core (fixes #8345) - * src/app/composer/qgscomposermapwidget.cpp: fix #4993 +Juergen E. Fischer 2013-07-22 -2012-02-21 Nathan Woodrow + sync qgsrasterblock sip (followup eaa27aa4f) - * src/app/qgisapp.cpp, src/app/qgsoptions.cpp, - src/core/composer/qgscomposermap.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp: Use zoom to mouse - by default. Fixes #5054 +Merge: bfcdc93 335d7f0 +Jürgen Fischer 2013-07-22 -2012-02-20 Nathan Woodrow + Merge pull request #758 from 3nids/siprasterblock + + [SIP] raster block: missing hasNoData() - * : Merge pull request #99 from spilth/master http://www.kyngchaos.com/ URL changes +Denis Rouzaud 2013-07-22 -2012-02-20 Marco Hugentobler + raster block: add missing hasNoData method in sip - * src/app/qgsmaptooloffsetcurve.cpp: Offset curve: snap to - background layers in mouse move +Merge: d0d2511 d394811 +Werner Macho 2013-07-22 -2012-02-20 Marco Hugentobler + Merge pull request #754 from ddanielvaz/ptBR + + pt-BR translation - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h, src/gui/qgsmapcanvas.cpp: Show spin - box for distance values in status bar on X11 (resize bug) +Nathan Woodrow 2013-07-22 -2012-02-20 Juergen E. Fischer + Auto save Python script file - * debian/qgis.desktop: collect GIS translation from wikipedia +Daniel Vaz 2013-07-21 -2012-02-20 Juergen E. Fischer + Fix #4189 - * ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd: osgeo4w: switch to GRASS 6.4.2 +Juergen E. Fischer 2013-07-21 -2012-02-19 Juergen E. Fischer + indentation update - * src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassmodule.h: fix #4259 +Juergen E. Fischer 2013-07-21 -2012-02-18 Juergen E. Fischer + raise cmake dependency to 2.8 - * src/providers/postgres/qgspostgresconn.cpp: postgres provider: - ignore errors on querying geography_columns +Daniel Vaz 2013-07-21 -2012-02-18 Werner Macho + Partial translation - * i18n/qgis_gl_ES.ts: translation update: galician by Xan +Daniel Vaz 2013-07-21 -2012-02-18 Werner Macho + partial translation to pt-BR - * i18n/qgis_id.ts: translation update: indonesian +Daniel Vaz 2013-07-19 -2012-02-13 Werner Macho + Partial translation - * i18n/qgis_it.ts: translation update: string update it language +Juergen E. Fischer 2013-07-21 -2012-02-18 Juergen E. Fischer + test fixes: + * use compareWkt in PyGeometry nad PyQgsRectangle + * skip PySpatialiteProvider if pyspatialite is unavailable + * show information about used fonts - * src/app/ogr/qgsogrsublayersdialog.cpp, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgsbrowserdockwidget.cpp, - src/app/qgsoptions.cpp, src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h, src/ui/qgsoptionsbase.ui: - apply #5041 (slighly modified) +Juergen E. Fischer 2013-07-21 -2012-02-18 Juergen E. Fischer + topology checker: catch difference error (fixes #7845) - * src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresdataitems.cpp: fix #5022 +Juergen E. Fischer 2013-07-21 -2012-02-18 Marco Hugentobler + renderchecker: create world files - * src/app/CMakeLists.txt, src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h, src/gui/qgsmapcanvas.cpp: Add - moving spin box to enter numeric value for curve offset +Nathan Woodrow 2013-07-21 -2012-02-18 Marco Hugentobler + Add missing alpha value option for colour ramps - * src/app/qgsmaptooladdpart.cpp, src/app/qgsmaptoolcapture.h: - [Backport]: Avoid intersection for QgsMapToolAddPart. Fixes ticket - #4624 +Juergen E. Fischer 2013-07-20 -2012-02-18 Marco Hugentobler + gml download: fix progress noise - * src/app/qgsmaptooladdfeature.cpp: Delete feature if add polygon - not successfull +Juergen E. Fischer 2013-07-20 -2012-02-17 mhugent + fix warning - * : Merge pull request #98 from lynxlynxlynx/master a crash fix and a tiny cleanup +Juergen E. Fischer 2013-07-20 -2012-02-17 Jaka Kranjc + composer item group: fix destruction - * src/app/qgsmaptooladdfeature.cpp: fixed crash when trying to add - features with invalid geometry QgsMapToolAddFeature::canvasReleaseEvent wasn't checking if geos - returned a sane geometry. One simple way of triggering the crash is - to click twice on the same point and then complete the op by - rightclicking. Of course this is not a real polygon, so things went - haywire after that. +Juergen E. Fischer 2013-07-20 -2012-02-17 Marco Hugentobler + wfs feature iterator: support ExactIntersect (fixes #8310) - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h: Add distance item +Juergen E. Fischer 2013-07-20 -2012-02-17 Marco Hugentobler + composer: save/restore item groups (fixes #7675) - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h, src/core/qgsgeometry.cpp: In case - of offset curve on background layers: try to merge together the - source layers +Juergen E. Fischer 2013-07-20 -2012-02-17 Juergen E. Fischer + german translation update - * debian/qgis.desktop: debian packaging update +Juergen E. Fischer 2013-07-20 -2012-02-16 Juergen E. Fischer + debian packaging updates - * debian/changelog, debian/qgis.desktop: debian packaging update +Nathan Woodrow 2013-07-19 -2012-02-16 Juergen E. Fischer + Update to new icon. Fix #6688 - * debian/rules: debian packaging: drop extra QtWebkit include path - on natty and oneiric +Juergen E. Fischer 2013-07-20 -2012-02-16 Juergen E. Fischer + fix typo - * src/gui/qgsmessagelogviewer.cpp: message log status bar icon: - hide by default - show when new messages arrive while log is closed - hide when message log is opened +Juergen E. Fischer 2013-07-20 -2012-02-15 Juergen E. Fischer + browser: add credential dialog (fixes #6044) - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsselectedfeature.cpp, - src/app/nodetool/qgsvertexentry.cpp, - src/app/nodetool/qgsvertexentry.h: fix #5017 and fix #5024 +Juergen E. Fischer 2013-07-19 -2012-02-15 Juergen E. Fischer + GdalTools: use int to compare versions (fixes #8323) - * src/providers/postgres/qgspgsourceselect.cpp: fix #5023 +Juergen E. Fischer 2013-07-19 -2012-02-15 Marco Hugentobler + test fixes: + * port python test to sip api v2 (fixes #8314) + * introduce compareWkt for more tolerant WKT comparisions in C++ tests + * require UTF-8 locale for regression1141 test on linux - * src/app/qgsmaptooloffsetcurve.cpp, - src/app/qgsmaptooloffsetcurve.h, src/core/qgsgeometry.cpp, - src/core/qgsgeometry.h, src/gui/qgsmapcanvassnapper.h: Add user - interaction, snapping, etc. for offset curve tool +Juergen E. Fischer 2013-07-19 -2012-02-15 Radim Blazek + catch transformation exceptions in pal labeling (fixes #7730) - * src/gui/qgsnewhttpconnection.cpp, src/gui/qgsnewhttpconnection.h, - src/providers/wfs/qgswfsconnection.cpp: WMS and WFS credential - separated, credentials not yet used in WFS, it would be just another - hack until we get a common class for uri encoding +Marco Hugentobler 2013-07-19 -2012-02-15 Juergen E. Fischer + Fix vertical alignment in data defined labeling - * src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp, - src/app/qgsidentifyresults.cpp, - src/providers/wms/qgswmsprovider.cpp: wms feature info: - use extent of last GetMap for GetFeatureInfo - use QWebView instead of QTextBrowser to show html results and - show errors on GetFeatureInfo +D'Hont René-Luc 2013-07-19 -2012-02-15 Alexander Bruy + Transform layerName for typeName in WFS GetCapabilities - * src/app/qgsrasterlayerproperties.cpp, - src/ui/qgsrasterlayerpropertiesbase.ui: move Colormap tab next to - the Style tab (fix #5018) +Merge: ddef9a9 1faadbc +Werner Macho 2013-07-19 -2012-02-15 Alexander Bruy + Merge pull request #750 from artfwo/master + + Fix misc typos and untranslatable strings - * python/plugins/fTools/tools/doIntersectLines.py: better fix for - #5010 +Artem Popov 2013-07-19 -2012-02-15 Alexander Bruy + Fix misc typos and untranslatable strings - * src/ui/qgsnewspatialitelayerdialogbase.ui: minor UI fix in New - SpatiaLite layer dialog +Juergen E. Fischer 2013-07-19 -2012-02-13 Arunmozhi + fix some tests: + * put spatialite test database into temp path + * relaxed WKT comparison - * src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: - [FEATURE] Group selected layers on right click +Juergen E. Fischer 2013-07-19 -2012-02-14 Juergen E. Fischer + also determine primary key in spatialite 4 - * src/providers/postgres/qgspostgresprovider.cpp: fix 659abb8d - (fixes #5016) +Victor Olaya 2013-07-19 -2012-02-14 Juergen E. Fischer + [sextante]adapted some saga names + + Some code cleaning - * i18n/qgis_de.ts, src/app/nodetool/qgsselectedfeature.cpp: fix - string mishap in nodetool +Werner Macho 2013-07-18 -2012-02-14 Juergen E. Fischer + translation update: sv by Victor - * src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h: fix crash when - the current maptool is destroyed +Marco Hugentobler 2013-07-18 -2012-02-14 Juergen E. Fischer + Fix scaling of rotated svg markers if printing a QGIS server WMS with QGIS desktop - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - fix primary key detection, if column is behind geometry column - add support for varchar length limits +Victor Olaya 2013-07-18 -2012-02-14 Alexander Bruy + Changed how postexecution errors are handled in algorithms caling external apps + + Improved R error messages - * python/plugins/fTools/tools/doIntersectLines.py: fix Intersect - lines tool +Victor Olaya 2013-07-17 -2012-02-14 Marco Hugentobler + [sextnate] minor algorithm improvements and renaming - * src/core/symbology-ng/qgsmarkersymbollayerv2.cpp, - src/core/symbology-ng/qgssvgcache.cpp: Draw svg symbols as vectors - if there is rotation +Victor Olaya 2013-07-17 -2012-02-14 Marco Hugentobler + [sextante] adapted SAGA binding to support different versions in windows and linux - * src/analysis/vector/qgsgeometryanalyzer.cpp: Small fix for linear - referencing +Victor Olaya 2013-07-15 -2012-02-13 Juergen E. Fischer + Revert "[sextante] removed "lib" prefix in saga calls" + + This reverts commit 1c2e49ed249a89480c1195f50c96614dc72700d3. + + Conflicts: +python/plugins/sextante/saga/SagaAlgorithm.py - * src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspostgresdataitems.cpp: fix build error on - osx +pcav 2013-07-18 -2012-02-13 Juergen E. Fischer + More IT GUI translation - * src/plugins/heatmap/heatmapguibase.ui: heatmap: add grid layouts +vmora 2013-07-18 -2012-02-13 Juergen E. Fischer + fix rubberband test - * i18n/qgis_de.ts: german translation update +Matthias Kuhn 2013-07-18 -2012-02-13 Juergen E. Fischer + Some further small improvements to QgsRubberband - * src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h: postgres provider: move - connection settings to QgsPostgresConn (also fixes #4998 and #4999) +vmora 2013-07-18 -2012-02-13 Juergen E. Fischer + fix #4819 + improves rendering speed of complex rubberbands - * debian/changelog, debian/qgis.install: debian packaging: include - heatmap plugin (fixes #4994) +vmora 2013-07-17 -2012-02-13 Werner Macho + - fix issue4819 + - modify polygon render to exclude consectuvie points that are less than + a pixel appart + - moved inner loop debug prints to level 3 and 4 since they where + slowing down too much the code in debug - * src/core/raster/qgsrasterlayer.cpp: fix small typos +Juergen E. Fischer 2013-07-18 -2012-02-13 Werner Macho + adapt some tests to 'better' wkt (followup b1efd479) - * i18n/qgis_et.ts: translation update: et by Veiko +Alexander Bruy 2013-07-18 -2012-02-13 Werner Macho + fix PyQgsSymbolLayerV2 test - * doc/TRANSLATORS: added new italian translators +Merge: ab4fc78 728ec25 +Werner Macho 2013-07-18 -2012-02-13 Juergen E. Fischer + Merge pull request #748 from Jean-Roc/mywork + + update french translation - * scripts/tsstat.pl: update tsstat.pl +Alexander Bruy 2013-07-18 -2012-02-12 pcav + fix PyQgsVectorLayer test - * i18n/qgis_it.ts: Translation of IT GUI finished (to be checked). - Thanks to Roberto (BobMaX) Angeletti and Alessandro Fanna. +Jean-Roc Morreale 2013-07-18 -2012-02-12 Juergen E. Fischer + update french translation - * i18n/qgis_de.ts, src/providers/postgres/qgspostgresconn.cpp: fix - #4992 +Juergen E. Fischer 2013-07-18 -2012-02-12 Juergen E. Fischer + run REPACK after deleting features (fixes #8317) - * i18n/qgis_de.ts: german translation update +Nathan Woodrow 2013-07-18 -2012-02-12 Juergen E. Fischer + Disable field in attribute table if field is not editable - * src/ui/qgsattributetabledialog.ui: fix tooltip string +Juergen E. Fischer 2013-07-17 -2012-02-12 pcav + - introduce qgsDoubleToString for format double with maximum precision + - usage in mssql provider fixes #7638 + - read precision in mssql provider (fixes #5966) + - commit errors are only shown once - * i18n/qgis_it.ts: More IT GUI translation - thanks Alessandro Fanna +Merge: f1e0498 73a9255 +Werner Macho 2013-07-17 -2012-02-11 Juergen E. Fischer + Merge pull request #745 from yoichigmf/for_pull_req + + update GUI translation JA - * src/app/legend/qgslegend.cpp, src/gui/qgsmapcanvas.cpp: freeze - canvas instead of modifying the render flag when changing legend - (fixes #4982) +yoichigmf 2013-07-17 -2012-02-11 Giuseppe Sucameli + update GUI translation JA - * python/plugins/GdalTools/tools/doMerge.py, - python/plugins/GdalTools/tools/widgetMerge.ui: allow to choose input - directory in GdalTools Merge tool (fix #4930) +Alexander Bruy 2013-07-17 -2012-02-11 Juergen E. Fischer + fix PyQgsMemoryProvider test - * src/app/qgslabelinggui.cpp: fix #4981 +Juergen E. Fischer 2013-07-17 -2012-02-11 Juergen E. Fischer + vector join: put subset string in parentheses (followup af8479e72; closes pull request #571; fixes #7743) - * python/core/qgsmaplayer.sip, - src/analysis/interpolation/TriDecorator.h, - src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h, - src/app/qgisapp.cpp, src/core/pal/hashtable.hpp, - src/core/qgsdataprovider.h, src/core/qgsdiagram.h, - src/core/qgsexpression.h, src/core/qgsmaplayer.cpp, - src/core/qgsmaplayer.h, src/core/raster/qgsrasterlayer.cpp, - src/core/raster/qgsrasterlayer.h, - src/core/renderer/qgsgraduatedsymbolrenderer.cpp, - src/core/spatialite/spatialite.c, - src/core/symbology-ng/qgsrendererv2registry.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/attributetable/qgsattributetablememorymodel.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/mapserver/qgswmsserver.cpp, src/plugins/globe/globe_plugin.h, - src/plugins/globe/qgsosgearthtilesource.cpp, - src/plugins/globe/qgsosgearthtilesource.h, - src/plugins/grass/qgsgrassedit.cpp, - src/plugins/grass/qgsgrassmapcalc.cpp, - src/plugins/grass/qgsgrassmapcalc.h, - src/plugins/grass/qtermwidget/ShellCommand.cpp, - src/providers/grass/qgsgrassprovider.cpp, - src/providers/grass/qgsgrassprovider.h, - src/providers/osm/osmhandler.cpp, src/providers/osm/osmhandler.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/sqlanywhere/qgssqlanywhereprovider.cpp, - src/providers/sqlanywhere/qgssqlanywhereprovider.h, - src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfsprovider.h, - src/providers/wms/qgswmsprovider.h: fix warnings from clang +Juergen E. Fischer 2013-07-17 -2012-02-11 Giuseppe Sucameli + manually merge pull request #744 (fixes #7444) - * python/plugins/GdalTools/tools/doBuildVRT.py, - python/plugins/GdalTools/tools/widgetBuildVRT.ui: add - -allow_projection_difference option (fix #4888) +Nathan Woodrow 2013-07-17 -2012-02-11 Nathan Woodrow + Set sip api in __init__.py - * doc/AUTHORS, doc/CONTRIBUTORS: add myself to the Authors list :) +Alexander Bruy 2013-07-17 -2012-02-11 pcav + update layer fields after zonal statistics calculation - * i18n/qgis_it.ts: More IT GUI translation - sill incomplete. +Alexander Bruy 2013-07-15 -2012-02-11 Nathan Woodrow + unittest for QgsZonalStatistics - * doc/CONTRIBUTORS: Add Arunmozhi to contributors list for his work - on the heatmap plugin +Alexander Bruy 2013-07-15 -2012-02-11 Nathan Woodrow + handle truncating of long fieldnames (mainly for shapefiles) - * src/core/composer/qgscomposerlegend.cpp: Don't leave space for - empty title. Semi fixes #3484 +nyalldawson 2013-07-08 -2012-02-11 Nathan Woodrow + Fix calculation of heatmap raster size (fix #8194) - merged for further testing - * src/ui/qgscomposerbase.ui: Change tool tip for composer legend. - Fixes #4980 +Merge: f4ac684 cf0676c +Nathan Woodrow 2013-07-16 -2012-02-07 Nathan Woodrow + Merge pull request #743 from ddanielvaz/fix-7620 + + Fix #7620 - * src/app/composer/qgscomposerlegendwidget.cpp, - src/app/composer/qgscomposerlegendwidget.h, - src/core/composer/qgscomposerlegend.cpp, - src/core/composer/qgscomposerlegend.h, - src/ui/qgscomposerlegendwidgetbase.ui: [FEATURE] Add multi line - support for legend title, groups, and items. Semi fix for #3484 +Daniel Vaz 2013-07-16 -2012-02-10 Juergen E. Fischer + Fix #7620 - * src/app/gps/qgsgpsinformationwidget.cpp: ignore invalid gps - coordinate even if there seems to be a fix +Werner Macho 2013-07-17 -2012-02-09 Juergen E. Fischer + translation update: korea - * src/app/legend/qgslegend.cpp: fix #4971 +Juergen E. Fischer 2013-07-16 -2012-02-09 Werner Macho + wfs provider: fix support for non-ascii wfs layer names (fix #7848) - * i18n/qgis_es.ts: translation update: es by Carlos +Juergen E. Fischer 2013-07-16 -2012-02-09 Alexander Bruy + vector join: fix quoting in subset string - * src/providers/wms/qgswmssourceselect.cpp: case insensitive search - for CRS in WMS provider +D'Hont René-Luc 2013-07-16 -2012-02-09 Juergen E. Fischer + Bug #8166 GetFeatureInfo: clickable area too small for points + + For point layers, clicking exactly on the point is difficult, and the user misses the popup very often. + Better define a larger clickable area. + This commit enlarge the area for point by 2. - * i18n/qgis_de.ts, src/ui/qgisapp.ui, - src/ui/qgsdbsourceselectbase.ui: postgis string fixes +Juergen E. Fischer 2013-07-16 -2012-02-09 Marco Hugentobler + fix 2fa77362 - * src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgsmaptoolmovefeature.cpp, - src/app/qgsmaptooloffsetcurve.cpp, src/app/qgsmaptooloffsetcurve.h, - src/ui/qgisapp.ui: [FEATURE]: maptool for parallel line displacement +Juergen E. Fischer 2013-07-16 -2012-02-09 Juergen E. Fischer + vector file writer: add support for DBF files (fixes #7507) - * src/ui/qgsrasterlayerpropertiesbase.ui: arrange buttons on raster - transparency tab horizontally +Juergen E. Fischer 2013-07-16 -2012-02-09 Juergen E. Fischer + ogr provider: move REPACK into createSpatialIndex. Don't REPACK in deleteFeatures as there might still be pending changes that depend on the current feature ids (fixes #7472) - * i18n/qgis_de.ts: minor german translation update +Merge: 530610d d476aed +Nathan Woodrow 2013-07-16 -2012-02-09 Juergen E. Fischer + Merge pull request #732 from ddanielvaz/fix-5789 + + Fix #5789 - * src/ui/qgsrasterlayerpropertiesbase.ui: restore buttons to bottom - and put pages in scroll areas for raster properties too +Merge: bbd257f 00615ae +Nathan Woodrow 2013-07-16 -2012-02-09 Juergen E. Fischer + Merge pull request #742 from 3nids/colorconform + + better color uniformity - * src/ui/qgsvectorlayerpropertiesbase.ui: restore buttons to bottom - of vector layer properties and put pages into scroll areas +Juergen E. Fischer 2013-07-16 -2012-02-09 Juergen E. Fischer + also accept first ellipsoid (followup be7a026190) - * src/core/qgsvectorlayer.cpp: setRenderer(V2) also updates V2 - renderer flag +Merge: 13c71d4 df627b1 +volaya 2013-07-16 -2012-02-08 Juergen E. Fischer + Merge pull request #738 from radosuav/sextante_file_extensions + + [sextante] Append output file extension if missing - * i18n/qgis_de.ts: yet another german translation update +Merge: 29a4bc0 be7a026 +Jürgen Fischer 2013-07-16 -2012-01-06 Marco Bernasocchi + Merge pull request #736 from Oslandia/issue7441 + + fix issue7441 - * CMakeLists.txt, cmake/FindQtMobility.cmake, - src/app/gps/qgsgpsinformationwidget.cpp, src/core/CMakeLists.txt, - src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h, - src/core/gps/qgsgpsdetector.cpp, - src/core/gps/qgsqtlocationconnection.cpp, - src/core/gps/qgsqtlocationconnection.h, src/plugins/CMakeLists.txt, - src/plugins/compass/CMakeLists.txt, - src/plugins/compass/compass.cpp, src/plugins/compass/compass.h, - src/plugins/compass/compass.qrc, - src/plugins/compass/qgscompassplugin.cpp, - src/plugins/compass/qgscompassplugin.h, - src/plugins/compass/qgscompassplugingui.cpp, - src/plugins/compass/qgscompassplugingui.h, - src/plugins/compass/qgscompasspluginguibase.ui, - src/ui/qgsgpsinformationwidgetbase.ui, - src/ui/qgsrasterlayerpropertiesbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui: android goodies (pull - request #94): [Marco Bernasocchi] - adding needed files to support internal GPS via QtMobility, - implementation of QgsQtLocationConnection is only a stub - cleaning up methods names - adding mobility to CMakeLists - testing - added hack to test parseData() - adding more parsing stuff - Adding debugging info and making connection fail if no QtSatellite - datasource available - Initial working GPS with coordinates bug (values shifted) - Adding Initial GPS support to android using QtLocation - Adding Ground speed and direction - put ok button on top of widget to make it usable until scroll area - is added (HACK to be Reverted later) - added vertical and horizontal accurancy - Removing test values qtlocationconnection - refactor debug messages - adding compass plugin - trying NathanW suggestion - adding new compass plugin - Fixed satellitesUpdated signals - removing setDataRate - temporarely removed calibrationLevel display to be reverted when - https://sourceforge.net/p/necessitas/tickets/153/ is fixed - addin comment - making QLineEdits readonly - added calibration level support [Jürgen E. Fischer] - squashed, reindented and skipped some already addressed changes to - qgisapp and vector layer provider +Merge: 2fa7736 45ab8cc +Jürgen Fischer 2013-07-16 -2012-02-08 Juergen E. Fischer + Merge pull request #715 from Oslandia/issue7550 + + solves Issue7550 - * src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - pre-select first integer column as primary key for views - also consider oid type as integer column +Nathan Woodrow 2013-07-16 -2012-02-08 Juergen E. Fischer + Only restore geometry for non custom attribute forms - * src/plugins/heatmap/heatmap.cpp: heatmap plugin: fix menu removal +Juergen E. Fischer 2013-07-16 -2012-02-08 Tim Sutton + dbmanager: fix spatialite connection error message - * : Merge changes from QGIS upstream +Juergen E. Fischer 2013-07-16 -2012-02-08 Alexander Bruy + german translation update - * src/app/qgisapp.cpp: enable Toggle editing button depending on - layer type (fix #4965) +Merge: 9093bcd eea246a +Jürgen Fischer 2013-07-16 -2012-02-08 Alexander Bruy + Merge pull request #739 from minorua/fixbld + + fix build (follows 0e7b60e) - * : Merge remote-tracking branch 'upstream/master' +Denis Rouzaud 2013-07-16 -2012-02-08 pcav + better colors - * i18n/qgis_it.ts: Some more IT GUI translation - thanks Alesandro - Fanna and BobMaX +Marco Hugentobler 2013-07-16 -2012-02-08 Juergen E. Fischer + Fix memory leak in multiband color renderer - * i18n/qgis_de.ts, resources/context_help/HeatmapGui-de_DE, - resources/context_help/HeatmapGui-en_US: german translation update +Merge: dc489df 805be41 +Nathan Woodrow 2013-07-15 -2012-02-08 Juergen E. Fischer + Merge pull request #740 from 3nids/snapfirstnode + + Visual snapping when adding first node or starting feature (fix #8300) - * python/core/qgsmaplayerregistry.sip, - resources/context_help/HeatmapGui-en_US, - src/core/qgsmaplayerregistry.h, src/plugins/heatmap/heatmap.cpp, - src/plugins/heatmap/heatmapgui.cpp: heatmap updates: - fix warnings on windows - minor cleanups - some string updates +Denis Rouzaud 2013-07-16 -2012-02-08 Alexander Bruy + Visual snapping when adding first node or starting feature (fix #8300) - * src/plugins/heatmap/heatmap.cpp: fix Heatmap plugin unloading, - also place button to the Raster toolbar +Nathan Woodrow 2013-07-16 -2012-02-08 Juergen E. Fischer + Include system proxies - * src/core/qgsapplication.cpp, src/plugins/heatmap/heatmap.cpp, - src/plugins/heatmap/heatmap.h, src/plugins/heatmap/heatmapgui.cpp, - src/plugins/heatmap/heatmapgui.h: indentation update +Minoru Akagi 2013-07-16 -2012-02-08 Tim Sutton + fix build (follows 0e7b60e) - * src/plugins/heatmap/README: [FEATURE] added heatmap plugin to QGIS - master. Removed README from heatmap dir. Nominal commit to tag this - as a new feature. +Juergen E. Fischer 2013-07-16 -2012-02-08 Tim Sutton + fix windows build of grass fake library - * doc/CONTRIBUTORS: Removed Alex from contributors since he is in - AUTHORS +Juergen E. Fischer 2013-07-16 -2012-02-08 Tim Sutton + fix build on debian squeeze - * INSTALL, doc/INSTALL.html, - resources/context_help/HeatmapGui-en_US, - src/plugins/CMakeLists.txt, src/plugins/heatmap/CMakeLists.txt, - src/plugins/heatmap/README, src/plugins/heatmap/heatmap.cpp, - src/plugins/heatmap/heatmap.h, src/plugins/heatmap/heatmap.qrc, - src/plugins/heatmap/heatmap.svg, - src/plugins/heatmap/heatmapgui.cpp, - src/plugins/heatmap/heatmapgui.h, - src/plugins/heatmap/heatmapguibase.ui: Merged in Arunmozhi's heatmap - plugin into QGIS core +Nathan Woodrow 2013-07-16 -2012-02-08 Marco Hugentobler + Refresh canvas after show/hide layers. Fix #8096 - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgssymbolv2.h: Make QgsSymbolV2::renderHints() - const +Werner Macho 2013-07-15 -2012-02-07 Juergen E. Fischer + translation update: es by Carlos - * i18n/qgis_de.ts: german translation update +rmgu 2013-07-15 -2012-02-08 Werner Macho + [sextante] If no extension is specified for an output file append the + extension from the selected file filter. - * i18n/qgis_hr_HR.ts: translation update: hr_HR by Zoran +Juergen E. Fischer 2013-07-15 -2012-02-07 Juergen E. Fischer + fix #6978 - * python/core/symbology-ng-core.sip: match sip binding of - QgsSymbolV2::renderHints() to c++ interface +Merge: 133398b b54c981 +Jürgen Fischer 2013-07-15 -2012-02-07 Juergen E. Fischer + Merge pull request #730 from palmerj/wfs_client_fixes + + WFS client fixes - * src/core/qgsapplication.cpp: initialize - QgsApplication::mConfigPath later +Juergen E. Fischer 2013-07-15 -2012-02-07 Marco Hugentobler + wfs related fixes: + - wfs server: only filter by bbox if there was one given (fixes #8287) + - wfs provider: make feature attribute field types stick to the values + - vector layer properties, field properties: add (Qt) type column + - attribute table: sort Date and DateTime as such + - spatialindex: return false when an exception on insertion occured - * src/app/qgsmaptoolrotatepointsymbols.cpp: Render rotation tool - preview image +Merge: edf32f9 71c9c36 +Jürgen Fischer 2013-07-15 -2012-02-07 Marco Hugentobler + Merge pull request #737 from Oslandia/issue7856 + + Refs #7856. Fix model reference - * python/core/symbology-ng-core.sip, - src/app/qgsmaptoolrotatepointsymbols.cpp, - src/app/qgsmaptoolrotatepointsymbols.h, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.h, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgssinglesymbolrendererv2.h: Add support for - new symbology for rotate point tool +Borys Jurgiel 2013-07-15 -2012-02-07 Juergen E. Fischer + Follow up commit:7a7e54270 - * src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: spatialite - provider: prefer auth_id over proj4 string (fix #4958) +Hugo Mercier 2013-07-15 -2012-02-07 Nathan Woodrow + Refs #7856. Fix model reference - * src/app/composer/qgscomposerlegendwidget.cpp, - src/app/composer/qgscomposerlegendwidget.h, - src/core/composer/qgscomposeritemcommand.h, - src/core/composer/qgscomposerlegend.cpp, - src/core/composer/qgscomposerlegend.h, - src/ui/qgscomposerlegendwidgetbase.ui: Composer Legend: Add spacing - for groups. Fixes #4247 Patch by Anna Kratochvilova. Thanks! +Borys Jurgiel 2013-07-15 -2012-02-06 Juergen E. Fischer + [Plugin Installer] Handle all exception types when loading plugins. Fixes #8295. Breaks string freeze because it's a critical fix. - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - fix crs(), if no crs was requested +Werner Macho 2013-07-15 -2012-02-06 Juergen E. Fischer + changes to norwegian language due to two possibilities and added the new maintainer of the language - * src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h, - src/core/qgsmaprenderer.cpp: fix #3742: - after CRS changes reproject canvas extent regardless of OTFR - toggling OTFR off, switches the project CRS to the current layer - CRS (or first layer, if no layer is active). - toggling OTFR also saves the previous CRS setting and restores the - previous selected CRS. +Juergen E. Fischer 2013-07-15 -2012-02-06 Marco Hugentobler + also remove superfluous query items from WFS and WCS connections (as in WMS; + fixes #7848) - * src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.h, - src/gui/symbology-ng/qgssymbollayerv2widget.cpp, - src/gui/symbology-ng/qgssymbollayerv2widget.h, - src/ui/symbollayer/widget_svgfill.ui: Consider svg parameters for - svg fill +Nathan Woodrow 2013-07-15 -2012-02-05 Jürgen Fischer + Fix #8297. Select all when expression is blank - * : Merge pull request #92 from Jean-Roc/master update fr strings +Werner Macho 2013-07-15 -2012-02-05 Juergen E. Fischer + translation update: id and no - * src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h: - better fix than 4d0551f0 +Juergen E. Fischer 2013-07-15 -2012-02-05 Juergen E. Fischer + spatialite: fix handling of empty geometry column (fixes #8299) - * src/analysis/raster/qgsrelief.h, - src/app/ogr/qgsnewogrconnection.cpp: fix doxygen warnings +Merge: b5f38e3 6fcce28 +Nathan Woodrow 2013-07-15 -2012-02-05 Juergen E. Fischer + Merge pull request #697 from 3nids/svgzoomicon + + SVG icons for zoom related icons - * src/app/composer/qgscomposer.cpp: fix crash +Merge: 1a77cde 0f638fc +Nathan Woodrow 2013-07-15 -2012-02-05 Juergen E. Fischer + Merge pull request #735 from 3nids/iconsqloracle + + added oracle raster, sql anywhere icons. Conform colors for raster icon - * src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h, - src/app/ogr/qgsogrhelperfunctions.cpp, - src/app/ogr/qgsopenvectorlayerdialog.cpp, src/app/qgsbookmarks.cpp, - src/app/qgsfieldcalculator.cpp, src/app/qgsmaptoolidentify.cpp, - src/core/symbology-ng/qgsrendererv2.h, src/gui/qgscomposerview.cpp, - src/gui/qgsexpressionbuilderwidget.cpp, - src/helpviewer/qgshelpviewer.cpp: indentation update +vmora 2013-07-15 -2012-02-05 Nathan Woodrow + fix issue7441 by automatically setting the projection elipsoid to fit + the selected CRS - * : Merge pull request #91 from szekerest/master Improve the support for OGR/MSSQL driver +pcav 2013-07-15 -2012-02-05 Nathan Woodrow + More IT GUI translation - * src/app/composer/qgscomposer.cpp: Fix restoring of composition - widget missed in last refactor +Denis Rouzaud 2013-07-15 -2012-02-01 Nathan Woodrow + new simple draw icon - * python/gui/qgscomposerview.sip, src/app/composer/qgscomposer.cpp, - src/app/composer/qgscomposer.h, src/gui/qgscomposerview.cpp, - src/gui/qgscomposerview.h, src/ui/qgscomposerarrowwidgetbase.ui, - src/ui/qgscomposerbase.ui, src/ui/qgscomposeritemwidgetbase.ui, - src/ui/qgscomposerlabelwidgetbase.ui, - src/ui/qgscomposerlegendwidgetbase.ui, - src/ui/qgscomposermapwidgetbase.ui, - src/ui/qgscomposerpicturewidgetbase.ui, - src/ui/qgscomposerscalebarwidgetbase.ui, - src/ui/qgscomposertablewidgetbase.ui, - src/ui/qgscompositionwidgetbase.ui: Redesign composer; use dock - widgets vs splitter; reduce scrolling in item widgets +Denis Rouzaud 2013-07-08 -2012-02-05 szekerest + better draw icon - * src/app/ogr/qgsogrhelperfunctions.cpp, - src/app/ogr/qgsopenvectorlayerdialog.cpp, - src/providers/ogr/qgsogrprovider.cpp: Improve the support for - OGR/MSSQL driver +Denis Rouzaud 2013-07-04 -2012-02-04 Juergen E. Fischer + SVG icons for zoom related icons, refine pointer in action and identify icons, completed svg-base - * python/core/qgsexception.sip: fix #4941 +Denis Rouzaud 2013-07-15 -2012-02-03 Marco Hugentobler + added oracle raster, sql anywhere icons. Conform colors for raster icon - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.h: Add comment +Juergen E. Fischer 2013-07-15 -2012-02-03 Marco Hugentobler + osgeo4w: update to grass 6.4.3RC4 - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Work with a distance - tolerance for locateAlongFeature, report event items where linear - referencing did not succeed +Merge: 94c5f53 618ffa0 +Nathan Woodrow 2013-07-14 -2012-02-03 Alexander Bruy + Merge pull request #729 from minorua/gdal_filename + + make filename encoding consistent (gdal/ogr) - * python/plugins/fTools/tools/doSimplify.py: fix Densify tool +Werner Macho 2013-07-15 -2012-02-03 Juergen E. Fischer + translation update: fi by Kari - * src/app/ogr/qgsvectorlayersaveasdialog.cpp, - src/app/ogr/qgsvectorlayersaveasdialog.h, src/app/qgisapp.cpp, - src/ui/qgsvectorlayersaveasdialogbase.ui: vector layer save as: - replace 'original crs' with 'layer crs' and 'project crs' - OTFR - doesn't matter anymore (fixes #4109) +Merge: 6d48f11 7a288d1 +Werner Macho 2013-07-14 -2012-02-02 Juergen E. Fischer + Merge pull request #733 from Cracert/trans3 + + translation update: pl - * src/app/ogr/qgsvectorlayersaveasdialog.cpp, - src/app/ogr/qgsvectorlayersaveasdialog.h, src/app/qgisapp.cpp, - src/ui/qgsvectorlayersaveasdialogbase.ui: optionally add save vector - file to canvas (fix #4598) +Robert Szczepanek 2013-07-14 -2012-02-02 Juergen E. Fischer + translation update: pl (CSV) - * src/core/qgsvectorlayer.cpp: execute undo stack on rollBack() - (fixes #4635) +Daniel Vaz 2013-07-14 -2012-02-02 Alexander Bruy + Fix #5789 - * src/app/qgshighlight.cpp: fix highlighting for identify tool when - OTF enabled (closes #4843) +Juergen E. Fischer 2013-07-14 -2012-02-02 Alexander Bruy + wfs server: fix multilinestring parsing - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/frmGeometry.ui: fTools: option to select - create new shape or update existing layer when exporting geometry - column +Victor Olaya 2013-07-14 -2012-02-01 Alexander Bruy + [sextante] change saga algorithms to use full name for cmdname - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/frmGeometry.ui: [FATURE] fTools: option - to export geometry column using layer CRS, project CRS or ellipsoid +Victor Olaya 2013-07-14 -2012-02-02 Marco Hugentobler + [sextante] minor fixes and algorithm changes - * src/analysis/vector/qgsgeometryanalyzer.cpp: Fix for locateBetween - method +Juergen E. Fischer 2013-07-14 -2012-02-02 Juergen E. Fischer + wfsprovider: also set srsName of changed geometries (followup 1ea6267cb) - * src/app/composer/qgscomposerlabelwidget.cpp: don't set parent of - QFontDialog (fixes #4937, but makes it not follow the globally set - font size) +Juergen E. Fischer 2013-07-14 -2012-02-02 Juergen E. Fischer + german translation update - * python/core/qgsgpsconnectionregistry.sip, - src/core/gps/qgsgpsconnectionregistry.cpp, - src/core/gps/qgsgpsconnectionregistry.h: fix sip gps bindings +Juergen E. Fischer 2013-07-14 -2012-02-01 Juergen E. Fischer + wfsprovider: set srsName of new geometries (fixes #7880) - * i18n/qgis_de.ts, src/gui/qgsexpressionbuilderwidget.cpp, - src/helpviewer/qgshelpviewer.cpp: german translation update +Alexander Bruy 2013-07-14 -2012-02-01 Juergen E. Fischer + [sextante] update sample script to new API (fix #8278) - * src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - fix query support +Juergen E. Fischer 2013-07-14 -2012-02-01 Alexander Bruy + QGisApp: show commit errors as message bar first - * resources/context_help/QgsFieldCalculator-ru_RU: Russian - translation for field calculator context help. Thanks, Maxim! +Werner Macho 2013-07-14 -2012-02-01 Marco Hugentobler + translation update: es by Carlos - * src/analysis/vector/qgsgeometryanalyzer.h: More verbose comments - to linear reference functions +Juergen E. Fischer 2013-07-14 -2012-02-01 Marco Hugentobler + QgisApp: use qgsmessageviewer to report commit errors + QgsOgcUtils: fix multi geometry type creation and use QgsGeometry types instead of STL templates - * src/analysis/vector/qgsgeometryanalyzer.cpp: Display a progress - bar +Jeremy Palmer 2013-04-22 -2012-01-31 Marco Hugentobler + Remove some old code missed from 84f4346eae - * src/analysis/vector/qgsgeometryanalyzer.cpp: Support multiple - geometries per event object. Return zero geometry if result is emtpy +Jeremy Palmer 2013-04-22 -2012-01-30 Marco Hugentobler + Re-write MimeData Uri concat and split function to deal with layer names and urls that contain the ':' character - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Remove debug code, move - locateBetween and locateAlong to public interface +Jeremy Palmer 2013-06-30 -2012-01-30 Marco Hugentobler + If a network request error occurs while reading the streamed GML, then return a failure status from the getFeatures method - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Fix errors in - locateBetween +Jeremy Palmer 2013-04-22 -2012-01-27 Marco Hugentobler + Ensure progress dialogue shows for WFS GML requests - especially in the case that the geometry type is not determined from the server describe feature type request and we need to inspect the featuretype first feature - * src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: Support reference with - one measure (along) +Jeremy Palmer 2013-06-30 -2012-01-25 Marco Hugentobler + Bug Fix: WFS layers added from the browser no longer prompt the user for the layer coordinates system - * python/analysis/qgsgeometryanalyzer.sip, - src/analysis/vector/qgsgeometryanalyzer.cpp, - src/analysis/vector/qgsgeometryanalyzer.h: [FEATURE]: creation of - event layers in analysis lib using linear referencing +Juergen E. Fischer 2013-07-14 -2012-02-01 Giuseppe Sucameli + improve wfs error reporting in server and client - * python/plugins/GdalTools/tools/dialogSRS.py, - python/plugins/GdalTools/tools/doProjection.py, - python/plugins/GdalTools/tools/doTranslate.py, - python/plugins/GdalTools/tools/doWarp.py: set parent opening - projection selector dialog (fix #4931) +Salvatore Larosa 2013-07-14 -2012-02-01 Marco Hugentobler + get back the plugin manager svg icon again, removed mistakenly by 9138ba3 - * python/CMakeLists.txt, python/core/core.sip, - python/core/qgsgpsconnection.sip, - python/core/qgsgpsconnectionregistry.sip, - python/core/qgsgpsdconnection.sip, python/core/qgsgpsdetector.sip, - python/core/qgsnmeaconnection.sip: Add sip files for gps connection. - Patch from Marcel Huber, ticket #4826 +Minoru Akagi 2013-07-14 -2012-02-01 Alexander Bruy + make filename encoding consistent (gdal/ogr) - * resources/context_help/QgsFieldCalculator-en_US: updates to Field - calculator help from Alister Hood (fix #4405) +Merge: 9b4f461 6088fd7 +Nathan Woodrow 2013-07-13 -2012-02-01 Juergen E. Fischer + Merge pull request #713 from minorua/ftools + + fTools fixes - * resources/function_help/Conversions-de_DE, - resources/function_help/Field-de_DE, resources/function_help/Fields - and Values-de_DE, resources/function_help/Geometry-de_DE, - resources/function_help/Math-de_DE, - resources/function_help/Operators-de_DE, - resources/function_help/Record-de_DE, - resources/function_help/String-de_DE: add german function help - translations +Merge: 257b31e c9eb4f2 +Nathan Woodrow 2013-07-13 -2012-02-01 Nathan Woodrow + Merge pull request #728 from minorua/osgeo4w_gdalfilename + + OSGeo4W: make sure that GDAL_FILENAME_IS_UTF8 is YES (fix #8010) - * resources/function_help/Field-en_US, - resources/function_help/Fields and Values-en_US, - resources/function_help/Fields-en_US, - src/gui/qgsexpressionbuilderwidget.cpp: Expression builder: Rename - Fields to Fields and Values; Add help for when field is selected +Minoru Akagi 2013-07-14 -2012-02-01 Nathan Woodrow + OSGeo4W: make sure that GDAL_FILENAME_IS_UTF8 is YES (fix #8010) - * src/helpviewer/qgshelpviewer.cpp, - src/helpviewer/qgshelpviewerbase.ui: Help viewer: Add nicer help not - found message; reduce margins +Juergen E. Fischer 2013-07-14 -2012-02-01 Nathan Woodrow + qgis server: initialize network cache (fixes #7204) - * resources/function_help/Conversions-en_US, - resources/function_help/Fields-en_US, - resources/function_help/Geometry-en_US, - resources/function_help/Math-en_US, - resources/function_help/Operators-en_US, - resources/function_help/Record-en_US, - resources/function_help/String-en_US: Expression builder: Add group - header help +Nathan Woodrow 2013-07-14 -2012-02-01 Nathan Woodrow + Don't show messagebar for syntax check. No need - * src/gui/qgsexpressionbuilderwidget.cpp: Expression builder: Nicer - help not found message +Nathan Woodrow 2013-07-14 -2012-02-01 Juergen E. Fischer + Use exec file for python console - * src/core/qgsvectorlayer.cpp: reject empty field names in - QgsVectorLayer::addAttribute +Merge: 558fe92 7b55e21 +Werner Macho 2013-07-13 -2012-02-01 Juergen E. Fischer + Merge pull request #727 from Cracert/trans3 + + translation update: pl - * doc/CODING.t2t, scripts/chkspelling.sh, scripts/spelling.dat, - src/analysis/raster/qgsrelief.cpp, src/app/qgisapp.cpp, - src/app/qgsfieldcalculator.cpp: fix typos +Juergen E. Fischer 2013-07-13 -2012-02-01 Nathan Woodrow + dbmanager: adapt to sl4 metadata tables (fixes #8290) - * src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h: - Check for empty field name. Fixes #4914 +Robert Szczepanek 2013-07-13 -2012-01-31 Juergen E. Fischer + translation update: pl - * src/app/qgsmaptooladdfeature.cpp, - src/app/qgsmergeattributesdialog.cpp: save and restore position of - merge attribute dialog +Juergen E. Fischer 2013-07-13 -2012-01-31 Martin Dobias + wfs: minor cleanups and a fixed error message - * src/ui/qgslabelingguibase.ui: Increase scale range (#3189) +Juergen E. Fischer 2013-07-13 -2012-01-31 Martin Dobias + make QgsCompositionChecker less forgiving and readd a svg used in tests (fixes #7731) - * src/gui/symbology-ng/qgsrendererv2widget.cpp: Edit symbol - transparency in percent values [0-100] instead of [0-1] +Nathan Woodrow 2013-07-13 -2012-01-31 Martin Dobias + Don't inlude empty extents in full extents. Fix #7709 - * src/gui/qgsexpressionhighlighter.cpp: Fix expression builder - highlighting (#4913) +Juergen E. Fischer 2013-07-13 -2012-01-31 Marco Hugentobler + project file transform: don't imply we know the band count (fixes #7080, fixes #8283) - * src/app/qgsmaptooladdfeature.cpp: [Backport]: disable abort if - avoid intersections returns a different geometry type (e.g. - multitype instead of singletype). Temporary solution for ticket - #4880 +Larry Shaffer 2013-07-12 -2012-01-30 Juergen E. Fischer + Match size and greyscale color intensity for new default raster layer icon to other default layer icons - * i18n/qgis_de.ts: german translation update +Larry Shaffer 2013-07-12 -2012-01-30 Juergen E. Fischer + Ensure Add Oracle Raster Layer action comes before Add WMS Layer action on Manage Layers toolbar + + - Should come before Add SQL Anywhere Layer and just after Add Oracle Spatial Layer if all are supported and shown - * src/providers/postgres/qgspostgresconn.cpp: postgresql provider: - check connection state before running PQexec (fixes #4909) +Larry Shaffer 2013-07-12 -2012-01-30 Juergen E. Fischer + Ensure Add SQL Anywhere Layer action comes before Add WMS Layer action on Manage Layers toolbar - * src/providers/ogr/qgsogrprovider.cpp: support strange mysql - quoting +Juergen E. Fischer 2013-07-13 -2012-01-30 Juergen E. Fischer + freebsd support (applies #7909) - * src/app/qgsnewspatialitelayerdialog.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitesourceselect.cpp: add .db to - spatialite extensions (fixes #4919) +Larry Shaffer 2013-07-12 -2012-01-30 Martin Dobias + Ensure new GPX Layer action comes before Remove Layer action on Manage Layers toolbar - * src/app/qgsattributeactiondialog.cpp, - src/app/qgsfieldcalculator.cpp, src/app/qgslabelinggui.cpp, - src/gui/qgsexpressionbuilderdialog.cpp, - src/gui/qgsexpressionbuilderdialog.h, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/providers/wfs/qgswfssourceselect.cpp: Use the new expression - builder for rule filter editing +Merge: 2df4bdc 0017807 +Jürgen Fischer 2013-07-12 -2012-01-30 Marco Hugentobler + Merge pull request #581 from minorua/georef_nonascii + + Georeferencer: a fix to support non-ASCII path - * src/app/qgsrastercalcdialog.cpp: Apply loop improvement from - Arunmozhi also to raster calc dialog +Juergen E. Fischer 2013-07-12 -2012-01-29 Arunmozhi + split geometry: cleanup parts if split failed (followup 6272274f) - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp: refactored code to reduce loop in favour of a func +Pirmin Kalberer 2013-07-12 -2012-01-30 Juergen E. Fischer + UI defaults with layer toolbar on the left - * src/plugins/globe/globe_plugin_dialog.cpp: fix another build error - :( +Merge: cafc367 5256b80 +Jürgen Fischer 2013-07-12 -2012-01-30 Juergen E. Fischer + Merge pull request #717 from Oslandia/issue7244 + + geometry: don't check for cut edges and validate the split geometries instead (fixes #7244) - * src/plugins/offline_editing/offline_editing_plugin_gui.cpp: fix - build error +Juergen E. Fischer 2013-07-12 -2012-01-29 Juergen E. Fischer + spatialite provider: accept empty tables from spatialite 4 (fixes #7664) - * i18n/qgis_de.ts: german translation update +Larry Shaffer 2013-07-12 -2012-01-29 Juergen E. Fischer + Group and sort providers in browser listing by type then name - * src/app/gps/qgsgpsinformationwidget.cpp, src/app/qgisapp.cpp, - src/app/qgsconfigureshortcutsdialog.cpp, - src/app/qgsembedlayerdialog.cpp, - src/app/qgsrasterlayerproperties.cpp, - src/app/qgssinglesymboldialog.cpp, - src/app/qgsvectorlayerproperties.cpp, - src/gui/qgssearchquerybuilder.cpp, - src/gui/symbology-ng/qgssymbollayerv2widget.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp, - src/plugins/globe/globe_plugin_dialog.cpp, - src/plugins/gps_importer/qgsgpsplugin.cpp, - src/plugins/gps_importer/qgsgpsplugingui.cpp, - src/plugins/offline_editing/offline_editing_plugin_gui.cpp, - src/plugins/spit/qgsspit.cpp: cleanup separate file type names from - extensions in translations +Juergen E. Fischer 2013-07-12 -2012-01-29 Juergen E. Fischer + save as: also use numeric postfix in spatialite (followup ac21c6266) - * src/app/qgsundowidget.cpp, src/plugins/grass/qgsgrassplugin.cpp, - src/plugins/grass/qgsgrassselect.cpp, - src/plugins/grass/qgsgrassselect.h: fix warnings and icon size of - GRASS toolbar +Juergen E. Fischer 2013-07-12 -2012-01-29 Juergen E. Fischer + fix warning - * src/app/legend/qgslegend.cpp: also consider layer crs, when - initially zooming to the extent of the first layer +Merge: 2379129 3328758 +Werner Macho 2013-07-12 -2012-01-29 Juergen E. Fischer + Merge pull request #719 from artfwo/master + + Russian translation update. - * src/python/qgspythonutilsimpl.cpp: fix python path setting in - windows +Juergen E. Fischer 2013-07-12 -2012-01-29 Juergen E. Fischer + fix a translation string and a german translation - * src/python/qgspythonutilsimpl.cpp: use os.path.expand user for - home directories for python (reintroduces fixes from #2515) +Juergen E. Fischer 2013-07-12 -2012-01-29 Juergen E. Fischer + indentation update - * src/gui/qgsprojectionselector.cpp, - src/gui/qgsprojectionselector.h: cleanup projection selections - - makes it work via keyboard again +Nathan Woodrow 2013-07-12 -2012-01-29 Werner Macho + Move spacer to end in attribute dialog - * i18n/qgis_es.ts: translation update: es by Carlos +Juergen E. Fischer 2013-07-12 -2012-01-28 Juergen E. Fischer + wfs provider: remove old featureById and nextFeature + gml parsing: don't mistake attributes for features just because the have the same name and some cleanups - * cmake/SIPMacros.cmake, python/core/core.sip, - python/core/qgscoordinatetransform.sip, - python/core/qgsexception.sip, src/app/qgsmaptoolidentify.cpp, - src/providers/gdal/qgsgdalprovider.cpp: [API] add sip bindings for - QgsCsException +Merge: 272400e 58ba7dd +Nathan Woodrow 2013-07-12 -2011-12-26 Richard Duivenvoorde + Merge pull request #722 from 3nids/iconmouseontop + + accord wrench to Tim's changes in composer - * src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgsbookmarkitem.cpp, src/app/qgsbookmarkitem.h, - src/app/qgsbookmarks.cpp, src/app/qgsbookmarks.h, - src/ui/qgsbookmarksbase.ui: fix #3243 Richard Duivenvoorde (from - pull request #78) - crs taking into account, bookmarklist is now editable qtreeview - set better column names the column names from the table Juergen Fischer added refactoring: - move adding bookmarks into QgsBookmarks - make QgsBookmarks a singleton - delete multiple entries at once +Denis Rouzaud 2013-07-12 -2012-01-28 Juergen E. Fischer + delete base file - * src/core/qgscoordinatetransform.cpp, src/core/qgsmaprenderer.cpp, - src/core/raster/qgsrasterlayer.cpp, src/gui/qgsmapcanvas.cpp, - src/gui/qgsmapcanvas.h: reproject canvas extent on crs change with - OTFR enabled +Denis Rouzaud 2013-07-12 -2012-01-28 Nathan Woodrow + accord wrench to Tim's changes in composer - * src/app/qgsvectorlayerproperties.cpp: Put multi selection back for - fields tab, use extended selection instead +Nathan Woodrow 2013-07-12 -2012-01-28 Nathan Woodrow + Use positional for str.format(). Fix #8277 - * src/app/qgsvectorlayerproperties.cpp: Remove multiselect from - fields tab in layer properties +Merge: 9db8970 5de6836 +Nathan Woodrow 2013-07-12 -2012-01-27 Juergen E. Fischer + Merge pull request #721 from 3nids/iconmouseontop + + put cursor on top of identify/action icons - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - reload fields when columns disappear +Matthias Kuhn 2013-07-12 -2012-01-27 Juergen E. Fischer + Add "New SpatiaLiate Layer" icon and make it accessible from the toolbar - * src/app/composer/qgscomposer.cpp, src/app/qgisapp.cpp, - src/app/qgsembedlayerdialog.cpp, - src/app/qgsrasterlayerproperties.cpp, src/gui/qgisgui.cpp, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassnewmapset.cpp: use native file dialogs - wherever possible (fixes #3763) +Denis Rouzaud 2013-07-12 -2012-01-27 Juergen E. Fischer + put cursor on top of identify/action icons - * python/core/qgsmessagelog.sip, src/app/composer/qgscomposer.cpp, - src/app/composer/qgscomposer.h, src/app/qgisapp.cpp, - src/app/qgscustomization.cpp, src/app/qgslabelpreview.h, - src/app/qgsoptions.cpp, src/app/qgsvectorlayerproperties.cpp, - src/core/qgscoordinatetransform.cpp, src/core/qgsgeometry.cpp, - src/core/qgsmaprenderer.cpp, src/core/qgsmessagelog.cpp, - src/core/qgsmessagelog.h, src/core/qgsvectorlayer.cpp, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetableview.cpp, - src/gui/qgsmessagelogviewer.cpp, src/providers/grass/qgsgrass.cpp, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspostgresprovider.h: fix file permissions +Juergen E. Fischer 2013-07-12 -2012-01-27 pcav + oracle provider: fix log message - * src/plugins/grass/modules/v.in.region.qgm: Fixed v.in.region GRASS - module to accept lines. +Artem Popov 2013-07-12 -2012-01-27 pcav + Russian translation update. - * : commit 3c33cf8f9810edcb5a43d7585d477f3a4df06912 Author: pcav - Date: Fri Jan 27 12:04:18 2012 +0100 +Tim Sutton 2013-07-12 -2012-01-27 Nathan Woodrow + Use more consistent font for help icon - * src/ui/qgsattributetabledialog.ui: Set save button not checkable - - fixes #4290 +Tim Sutton 2013-07-12 -2012-01-27 Nathan Woodrow - - * src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/gui/symbology-ng/qgsrendererv2widget.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui: Rule-based renderer: Add - support to refine more then one rule at a time; decrease UI margins - -2012-01-26 Martin Dobias - - * python/core/symbology-ng-core.sip, src/core/qgsvectorlayer.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.h, - src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h: Rule-based renderer: - enable new labeling - -2012-01-27 Juergen E. Fischer - - * python/core/conversions.sip: fix python binding for - QgsVectorDataProvider::changeGeometryValues() - -2012-01-26 Juergen E. Fischer - - * src/providers/ogr/qgsogrprovider.cpp: fix #4227 - -2012-01-26 Werner Macho - - * i18n/qgis_af.ts, i18n/qgis_ar.ts, i18n/qgis_bg.ts, - i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, - i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_et.ts, - i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, - i18n/qgis_gl_ES.ts, i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, - i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, - i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_ko_KR.ts, - i18n/qgis_lo.ts, i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, - i18n/qgis_nl.ts, i18n/qgis_no.ts, i18n/qgis_pl_PL.ts, - i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts, i18n/qgis_ro.ts, - i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sl_SI.ts, - i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sv.ts, - i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, - i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, - i18n/qgis_zh_TW.ts: translation update: string update for all - languages - -2012-01-26 Juergen E. Fischer - - * i18n/qgis_de.ts: german translation update - -2012-01-26 Juergen E. Fischer - - * src/core/qgscoordinatetransform.cpp, src/core/qgsmaprenderer.cpp: - catch more transformation errors - -2012-01-26 Juergen E. Fischer - - * src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h, - src/app/qgisapp.cpp: handle composer window differently (partly - reverts a30eb373) - -2012-01-26 pcav - - * src/plugins/grass/modules/r.sunmask.date.time.qgm, - src/plugins/grass/modules/r.sunmask.position.qgm: Fix #4668 (GRASS - r.sunmask modules) - -2012-01-26 Juergen E. Fischer - - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/tools/dialogSRS.py, - python/plugins/GdalTools/tools/doClipper.py, - python/plugins/GdalTools/tools/doExtractProj.py, - python/plugins/GdalTools/tools/widgetBatchBase.py, - python/plugins/GdalTools/tools/widgetPluginBase.py, - python/plugins/fTools/tools/doDefineProj.py, - python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/doGeoprocessing.py, - python/plugins/fTools/tools/doIntersectLines.py, - python/plugins/fTools/tools/doMeanCoords.py, - python/plugins/fTools/tools/doMergeShapes.py, - python/plugins/fTools/tools/doPointDistance.py, - python/plugins/fTools/tools/doPointsInPolygon.py, - python/plugins/fTools/tools/doRandPoints.py, - python/plugins/fTools/tools/doRandom.py, - python/plugins/fTools/tools/doRegPoints.py, - python/plugins/fTools/tools/doSelectByLocation.py, - python/plugins/fTools/tools/doSimplify.py, - python/plugins/fTools/tools/doSpatialIndex.py, - python/plugins/fTools/tools/doSpatialJoin.py, - python/plugins/fTools/tools/doSubsetSelect.py, - python/plugins/fTools/tools/doSumLines.py, - python/plugins/fTools/tools/doValidate.py, - python/plugins/fTools/tools/doVectorGrid.py, - python/plugins/fTools/tools/doVectorSplit.py, - python/plugins/fTools/tools/doVisual.py, - python/plugins/mapserver_export/mapserverexport.py, - python/plugins/mapserver_export/mapserverexportdialog.py, - python/plugins/osm/OsmAddRelationDlg.py, - python/plugins/osm/OsmDownloadDlg.py, - python/plugins/osm/OsmImportDlg.py, - python/plugins/osm/OsmLoadDlg.py, python/plugins/osm/OsmSaveDlg.py, - python/plugins/osm/OsmUploadDlg.py, src/app/qgisapp.cpp, - src/plugins/grass/qgsgrassbrowser.cpp, - src/plugins/grass/qgsgrassmapcalc.cpp, - src/plugins/grass/qgsgrassmodule.h, - src/plugins/grass/qgsgrassplugin.cpp, - src/plugins/grass/qgsgrassselect.cpp, - src/plugins/grass/qgsgrassselect.h, - src/plugins/grass/qgsgrassutils.cpp, - src/plugins/grass/qgsgrassutils.h, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp: even more - font propagation - -2012-01-25 Juergen E. Fischer - - * src/app/ogr/qgsopenvectorlayerdialog.cpp, - src/app/ogr/qgsvectorlayersaveasdialog.cpp, - src/core/qgsvectordataprovider.cpp, - src/core/qgsvectorfilewriter.cpp, - src/gui/qgsencodingfiledialog.cpp, - src/plugins/spit/qgsshapefile.cpp: use QTextCodec::codecForLocale() - where "System" is not available (like android) - -2012-01-25 Juergen E. Fischer - - * src/app/composer/qgscomposer.cpp, src/app/legend/qgslegend.cpp, - src/app/qgisapp.cpp, src/app/qgsabout.cpp, src/app/qgsabout.h, - src/app/qgssponsors.cpp, src/app/qgssponsors.h: more font - propagation - -2012-01-25 Juergen E. Fischer - - * src/app/qgisapp.cpp, src/app/qgscustomization.cpp, - src/app/qgscustomization.h, - src/plugins/interpolation/qgsinterpolationdialog.cpp, - src/plugins/interpolation/qgsinterpolationplugin.cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp: set parents of various objects to propagate the font settings + Updated help icon for better theme consistency -2012-01-25 Martin Dobias +Tim Sutton 2013-07-12 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h: Rule-based renderer: - selection and drawing of markers works again + Make composer manager icon more visually consistent with handles of zoom tools and less dominant on toolbar. -2012-01-25 Juergen E. Fischer +Merge: 8c7723f 15101bd +Jürgen Fischer 2013-07-11 - * src/providers/postgres/qgspgtablemodel.cpp: postgres selection: - leave geometryless views enabled + Merge pull request #718 from ddanielvaz/fix-8275 + + cleanup temporary database after write check (fixes #8275) -2012-01-25 Martin Dobias +Merge: 0653127 9138ba3 +Nathan Woodrow 2013-07-11 - * src/core/qgsexpressionlexer.ll, - tests/src/core/testqgsexpression.cpp: Fixed parsing of numbers in - locales using other decimal point symbols + Merge pull request #700 from 3nids/svgaddlayers + + SVG icons for project and layer actions -2012-01-25 Martin Dobias +Denis Rouzaud 2013-07-05 - * src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h: Rule-based - renderer: polish rule refining - -2012-01-25 Juergen E. Fischer - - * src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspgtablemodel.cpp: postgres selection: - make geometryless table selectable - only make srid column editable when necessary - leave primary key column editable - require primary key selection for views - -2012-01-25 Alexander Bruy - - * src/app/qgsattributetabledialog.cpp, - src/app/qgsattributetabledialog.h, - src/ui/qgsattributetabledialog.ui: also add Pan to Selected button - to the attribute table dialog + SVG icons for project, add layers and help actions -2012-01-25 Werner Macho +Larry Shaffer 2013-07-11 - * i18n/qgis_ko_KR.ts: translation update: added korean translation - thanks to Sanghee and the korean team + Fix finding QScintilla2 lib: prefer local installs over system -2012-01-24 Juergen E. Fischer +Daniel Vaz 2013-07-11 - * src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp: - use 8pt default font size on android + Fix #8275 -2012-01-24 Juergen E. Fischer +Merge: b50a893 522aecc +Nathan Woodrow 2013-07-11 - * src/app/qgisapp.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp: fix warnings + Merge pull request #712 from ddanielvaz/fix-8219 + + Fix 8219 -2012-01-18 Alexander Bruy +Daniel Vaz 2013-07-09 - * images/images.qrc, python/gui/qgisinterface.sip, - python/gui/qgsmapcanvas.sip, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgisappinterface.cpp, - src/app/qgisappinterface.h, src/gui/qgisinterface.h, - src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h, src/ui/qgisapp.ui: - [FEATURE] new navigation tool Pan Map to Selection (fix #4031) + Fix #8219 -2012-01-24 Martin Dobias +Werner Macho 2013-07-11 - * src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp, - src/gui/symbology-ng/qgssymbollevelsv2dialog.h: Fixed symbol levels - dialog + translation update: es by carlos -2012-01-24 Martin Dobias +Juergen E. Fischer 2013-07-11 - * : [FEATURE] Merge branch 'rules' - new rule-based rendering Conflicts: src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp + german translation update -2012-01-24 Martin Dobias +Juergen E. Fischer 2013-07-11 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/ui/qgsrulebasedrendererv2widget.ui: Rule-based renderer: fixed - parent(), fixed drag'n'drop + dbmanager: fix setting html attributes (fixes #8271) -2012-01-24 Juergen E. Fischer +Juergen E. Fischer 2013-07-11 - * src/core/qgsvectorlayer.cpp: QgsVectorLayer: use featureAtId() in - selectedFeatures() (fixes #4856) + consider data defined svg pattern rotation (fixes #7736) -2012-01-24 Juergen E. Fischer +pcav 2013-07-11 - * ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd: osgeo4w update: build with Python - 2.7 + Initial update of IT GUI translation -2012-01-24 Juergen E. Fischer +Juergen E. Fischer 2013-07-11 - * src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsselectedfeature.cpp, - src/app/nodetool/qgsvertexentry.cpp, - src/app/nodetool/qgsvertexentry.h: fix #4858 + undo: only merge geometry changes on the feature (fixes #8265) -2012-01-23 Juergen E. Fischer +Victor Olaya 2013-07-11 - * src/app/qgisapp.cpp: repaint layer after commiting + [sextante] fixed bug in R installation check in windows -2012-01-23 Juergen E. Fischer +Victor Olaya 2013-07-11 - * src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - fix handling of broken connections + [sextante] algorithm fixes and minor changes -2012-01-23 Martin Dobias +Marco Hugentobler 2013-07-11 - * src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp, - src/gui/symbology-ng/qgssymbollevelsv2dialog.h, - src/ui/qgsrulebasedrendererv2widget.ui: GUI tweaks for rule-based - renderer widget and symbol level dialog + Make marker line angle calculation more robust against duplicated vertices -2012-01-23 Martin Dobias +vmora 2013-07-11 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrendererrulepropsdialogbase.ui, - src/ui/qgsrulebasedrendererv2widget.ui: Drag'n'drop for rules, rule - does not need a symbol + - fix issue 7244 -2012-01-23 Werner Macho +Werner Macho 2013-07-11 - * : Merge pull request #87 from Jean-Roc/master update fr translation + translation updates: korean -2012-01-23 Juergen E. Fischer +Juergen E. Fischer 2013-07-11 - * src/providers/postgres/qgspgnewconnection.cpp: implement #4823 + save as: add a numeric postfix to reserved field ogc_fid when saving to SQLite (fixes #8245) -2012-01-23 Juergen E. Fischer +vmora 2013-07-11 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider - fix + - test that fails because of issue7244 (split several polygons of a + multipolygon at the same time -2012-01-22 Jean-Roc Morreale +vmora 2013-07-11 - * i18n/qgis_fr.ts: update fr translation + - set primary key value to NULL in split when there is no default value. + - modified the test accordingly -2012-01-22 Juergen E. Fischer +vmora 2013-07-11 - * src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspgtablemodel.h: move layerURI from - QgsPgSourceSelect to QgsPgTableModel + - solves issue #7550 + - the feature modification stops (in edit buffer) once an error is found + - the test has been modified to refelect the real problem: the data + corruption, and not the commit failure if primary key are not unique -2012-01-21 Juergen E. Fischer +Minoru Akagi 2013-07-10 - * src/core/qgsdatasourceuri.cpp, - src/providers/postgres/qgscolumntypethread.cpp, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspgtablemodel.h, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - support tables with mixed srids + fTools: fix geoprocessing (fix #7298) -2012-01-22 Juergen E. Fischer +Merge: 9ed1803 62b30fc +Nathan Woodrow 2013-07-10 - * i18n/qgis_de.ts: german translation update + Merge pull request #711 from ddanielvaz/bugfixes + + Bugfixes for fTools. + + Fix #8218 + Fix #8069 + Fix #7073 -2012-01-21 Werner Macho +Daniel Vaz 2013-07-10 - * src/app/qgsoptions.cpp: fix typo myPath_s_ + Fix #8069 -2012-01-21 Werner Macho +Nathan Woodrow 2013-07-11 - * i18n/qgis_pt_BR.ts: translation update: pt_BR by Arthur + Copy joins on duplicate layer. Fix #8243 -2012-01-21 Werner Macho +Daniel Vaz 2013-07-10 - * i18n/qgis_gl_ES.ts: translation update: gl_ES by Xan + Fix #8069 -2012-01-21 Alexander Bruy +Nathan Woodrow 2013-07-11 - * src/app/qgsoptions.cpp: clear collected plugins path before - collecting svg path + Add label for composer picture search paths. Fix #7764 -2012-01-21 Martin Dobias +Merge: 42d57d6 3d6e468 +Jürgen Fischer 2013-07-10 - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui, - tests/src/core/CMakeLists.txt, - tests/src/core/testqgsrulebasedrenderer.cpp, - tests/src/gui/CMakeLists.txt, tests/src/gui/testrendererv2gui.cpp, - tests/src/gui/testrendererv2gui.h, - tests/testdata/rulebasedrenderer_invalid.xml, - tests/testdata/rulebasedrenderer_simple.xml: Model/view-based tree - of rules. Added basic unit test, GUI renderer test + Merge pull request #710 from pka/uidefaults + + Updated UI defaults (toolbars and panels) for app and composer -2012-01-21 Alexander Bruy +Juergen E. Fischer 2013-07-11 - * src/app/qgisapp.cpp: fix font in scale selector combobox + fix old labeling (fixes #8030) -2012-01-21 Alexander Bruy +Juergen E. Fischer 2013-07-11 - * src/app/qgisapp.cpp, src/app/qgisapp.h: avoid useless canvas - redraw when user interacts with scale selector + db manager: fix #8146 -2012-01-20 Juergen E. Fischer +Daniel Vaz 2013-07-06 - * src/app/qgsvectorlayerproperties.cpp, - src/app/qgsvectorlayerproperties.h, src/core/qgsvectorlayer.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h, - src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h, - src/ui/qgsvectorlayerpropertiesbase.ui: [FEATURE] add update extent - button in vector layer properties and implement - QgsDataProvider::updateExtents in postgres, ogr and spatialite - provider + Fix #7073 -2012-01-19 Juergen E. Fischer +Daniel Vaz 2013-07-09 - * src/core/gps/qgsgpstrackerthread.cpp, - src/core/gps/qgsgpstrackerthread.h, - src/plugins/interpolation/qgsinterpolationdialogbase.h: remove empty - source files + Fix #8069 -2012-01-19 Alexander Bruy +Daniel Vaz 2013-07-06 - * src/app/composer/qgscomposermanager.cpp, - src/app/ogr/qgsnewogrconnection.cpp, - src/app/ogr/qgsogrsublayersdialog.cpp, - src/app/ogr/qgsopenvectorlayerdialog.cpp, - src/app/ogr/qgsvectorlayersaveasdialog.cpp, src/app/qgisapp.cpp, - src/app/qgscustomprojectiondialog.cpp, - src/app/qgsdecorationcopyrightdialog.cpp, - src/app/qgsdecorationnortharrowdialog.cpp, - src/app/qgsdecorationscalebardialog.cpp, - src/app/qgsembedlayerdialog.cpp, src/app/qgslabelinggui.cpp, - src/app/qgsnewspatialitelayerdialog.cpp, - src/gui/qgsgenericprojectionselector.cpp, - src/gui/qgsnewvectorlayerdialog.cpp, src/gui/qgsquerybuilder.cpp, - src/gui/symbology-ng/qgsstylev2managerdialog.cpp, - src/providers/spatialite/qgsspatialitesourceselect.cpp, - src/providers/spatialite/qgsspatialitesourceselect.h, - src/ui/qgsnewogrconnectionbase.ui: force most core dialogs to - remember their state and restore it when opened (adresses #206) + Fix #8218 -2012-01-19 Juergen E. Fischer +Pirmin Kalberer 2013-07-10 - * src/app/qgslabelpreview.h: fix font preview in labeling + Updated UI defaults (toolbars and panels) for app and composer -2012-01-18 Juergen E. Fischer +Juergen E. Fischer 2013-07-10 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider - fixes + postgres provider: reload fields if a cursor query fails (fixes #8242) -2012-01-18 Juergen E. Fischer +Juergen E. Fischer 2013-07-10 - * src/app/qgisapp.cpp: back to using setStyleSheet to set the - fontsize + dbmanager: fix column renaming -2012-01-18 Juergen E. Fischer +Minoru Akagi 2013-07-10 - * src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - disable "Add" in selection dialog while column type thread is - running - fix detection of integer keys - when adding feature update attributes and feature id in passed - features + fTools: remove unnecessary checks on output field names (fix #8241) -2012-01-18 Juergen E. Fischer +vmora 2013-07-10 - * src/app/qgisapp.cpp: repaint vector layer on toggleEditing if the - there are vertex markers + - removed useless function getPrimaryKey since a member already exist + for that + - modified the test to have multiple column primary key (it fails for + the moment -2012-01-18 Juergen E. Fischer +Werner Macho 2013-07-09 - * src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/ui/qgsfieldcalculatorbase.ui: expression builder: fix typos and - warnings and follow selection (not just clicked) + translation update: german -2012-01-18 Juergen E. Fischer +Werner Macho 2013-07-09 - * python/core/qgsmessagelog.sip, src/core/CMakeLists.txt, - src/core/qgsmessagelog.cpp, src/core/qgsmessagelog.h, - src/gui/qgsmessagelogviewer.cpp, src/gui/qgsmessagelogviewer.h: use - signals for logging + some more string typo fixes -2012-01-18 Juergen E. Fischer +Victor Olaya 2013-07-09 - * i18n/qgis_de.ts: german translation update + [sextante] fixed problem with projections when using file inputs -2012-01-18 Alexander Bruy +Victor Olaya 2013-07-09 - * src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wms/qgswmssourceselect.cpp: add tooltips to abstract - field for WMS/WFS layers (addresses #4406). Also save and restore - WFS dialog size and position (addresses #206) + [sextante] algorithm fixes -2012-01-18 Alexander Bruy +Victor Olaya 2013-07-09 - * src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugingui.h, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.h, - src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp, - src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h, - src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp, - src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h, - src/plugins/gps_importer/qgsgpsplugingui.cpp, - src/plugins/interpolation/qgsinterpolationdialog.cpp, - src/plugins/interpolation/qgsinterpolationdialog.h, - src/plugins/offline_editing/offline_editing_plugin_gui.cpp, - src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp, - src/plugins/oracle_raster/qgsselectgeoraster_ui.h, - src/plugins/spatialquery/qgsspatialquerydialog.cpp, - src/plugins/spatialquery/qgsspatialquerydialog.h, - src/plugins/spit/qgsspit.cpp, src/plugins/spit/qgsspit.h, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.h: follow up - 2e7867a14e - -2012-01-18 Marco Hugentobler - - * src/analysis/raster/qgsrelief.cpp, - src/analysis/raster/qgsrelief.h: Better to use unsigned char - -2012-01-18 Marco Hugentobler - - * src/analysis/raster/qgsrelief.cpp, - src/analysis/raster/qgsrelief.h: Use byte raster bands for relief - plugin to generate smaller output rasters + [sextante] removed "lib" prefix in saga calls -2012-01-18 Juergen E. Fischer +Merge: 61062d7 7ccd3d0 +vmora 2013-07-09 - * doc/AUTHORS: add Marco Bernasocchi to AUTHORS + Merge remote-tracking branch 'upstream/master' -2012-01-18 Juergen E. Fischer +vmora 2013-07-09 - * src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp, - src/ui/qgsoptionsbase.ui: use applications default font instead of - style sheet to set options and determine default size (fixes - 5155176e) + - solved issue #7550 + - implemented getPrimaryKey member function of QgsSpatiaLiteProvider + - in addFeatures, if an attribute is a primary key, its value is set to + NULL so that sqlite generates a value automagically -2012-01-19 Nathan Woodrow +Juergen E. Fischer 2013-07-09 - * : commit 619083a264aa7b5fc019ad34aa8533147576e729 Author: Nathan - Woodrow Date: Sun Jan 15 19:25:26 2012 - +1000 + limit shapefile fieldname to 10 in fieldcalculator and add attribute dialog (fixes #8235) -2012-01-17 Juergen E. Fischer +Juergen E. Fischer 2013-07-09 - * src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp, - src/app/qgsoptions.h, src/ui/qgsoptionsbase.ui: fix setting of icon - size and allow to set global fontsize + browser: emit layoutAboutToBeChanged() before destroying home item (fixes #8221) -2012-01-17 Juergen E. Fischer +Borys Jurgiel 2013-07-09 - * src/providers/postgres/qgspostgresconn.cpp: fix #4832: also - consider schema in geometry_columns/geography columns + [Plugin Installer] Fixes #8244 (crash on closing http request) -2012-01-17 Giuseppe Sucameli +Werner Macho 2013-07-09 - * src/providers/postgres/qgspostgresprovider.cpp: show the correct - feature's type name in debug messages + translation update: ja and KR -2012-01-17 Juergen E. Fischer +Merge: 78b04df f4272e6 +Werner Macho 2013-07-09 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - fix default value assignment + Merge pull request #707 from qgis-jp/make_pull_req_from_ja + + update GUI translation JA -2012-01-17 Juergen E. Fischer +Juergen E. Fischer 2013-07-09 - * src/providers/postgres/qgspostgresprovider.cpp: postgis provider: - fix geometry detection + ogr provider: reopen the data source if a REPACK failed (fixes #7540) -2012-01-17 Juergen E. Fischer +vmora 2013-07-09 - * src/core/qgsvectorlayer.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h, - src/providers/spatialite/qgsspatialiteprovider.cpp: commit error - update: - push commit errors in PostgreSQL, OGR and SpatiaLite provider - add provider errors to commit error - postgres provider: improve handling of geography columns + - added test for issue #7550 -2012-01-17 Juergen E. Fischer +Merge: 0bb9543 9179953 +Nathan Woodrow 2013-07-09 - * src/app/qgsattributetabledialog.cpp, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetableview.cpp, - src/gui/attributetable/qgsattributetableview.h: attribute table: - show progress only every 5s + Merge pull request #546 from PhilippeDorelon/addfeatureJoin + + Fix #7072 : can't create a feature when a layer has a join -2012-01-17 Alexander Bruy +yoichigmf 2013-07-09 - * src/plugins/delimited_text/qgsdelimitedtextplugin.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugingui.h, - src/plugins/dxf2shp_converter/CMakeLists.txt, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.h, - src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui, - src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp, - src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h, - src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp, - src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h, - src/plugins/interpolation/qgsinterpolationdialog.cpp, - src/plugins/interpolation/qgsinterpolationdialog.h, - src/plugins/offline_editing/offline_editing_plugin_gui.cpp, - src/plugins/offline_editing/offline_editing_plugin_gui.h, - src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp, - src/plugins/oracle_raster/qgsselectgeoraster_ui.h, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogb - ase.ui, src/plugins/spatialquery/qgsspatialquerydialog.cpp, - src/plugins/spatialquery/qgsspatialquerydialog.h, - src/plugins/spit/qgsspit.cpp, src/plugins/spit/qgsspit.h, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp, - src/plugins/zonal_statistics/qgszonalstatisticsdialog.h: save size - and position of the core plugins dialogs (addresses #206) + update GUI translation JA -2012-01-17 Giuseppe Sucameli +Nathan Woodrow 2013-07-09 - * src/plugins/grass/qgsgrassmodule.cpp: GRASS py modules returns 1 - getting interface description (fix 4667) + Remove __getattr__, __setattr__ for QgsFeature + + Not such a good idea after all :) -2012-01-17 Sergey Yakushev +Juergen E. Fischer 2013-07-09 - * python/analysis/network/qgsgraphanalyzer.sip, - src/analysis/network/qgsgraphanalyzer.cpp, - src/analysis/network/qgsgraphanalyzer.h, - src/plugins/roadgraph/shortestpathwidget.cpp, - src/plugins/roadgraph/shortestpathwidget.h: RoadGraph: add dijkstra - method to Network analysis library, remove unused shortestpath, - update python bindings + french translation: add blank to window title -2012-01-17 Sergey Yakushev +Juergen E. Fischer 2013-07-09 - * : commit 3ba2fe9d04cd193a54bb8165bbcb79b22977d2ec Author: Juergen - E. Fischer Date: Mon Jan 16 21:22:52 2012 +0100 + fix 83cf4be9f68 -2012-01-16 Marco Hugentobler +Juergen E. Fischer 2013-07-09 - * src/app/composer/qgscomposer.cpp, - src/core/composer/qgscomposition.cpp: Fix for ticket 4813 and - cleanup legacy code in composer + browser: fix crash when removing favourite items from the directory tree (fixes #8236) -2012-01-15 Marco Hugentobler +Juergen E. Fischer 2013-07-08 - * src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: - Parameter for font color in GetLegendGraphic + postgres provider: set length and precision of native floating point types to -1 (fixes #8145) -2012-01-16 Juergen E. Fischer +William Kyngesburye 2013-07-08 - * python/core/conversions.sip, - python/core/qgsvectordataprovider.sip: add python binding to - QgsVectorDataProvider::fieldNameMap() + OS X install updates -2012-01-15 Juergen E. Fischer +Pirmin Kalberer 2013-07-09 - * src/core/qgsvectorlayer.cpp, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.cpp: error logging: - fix key message in postgres provider - add logging of errors to spatialite provider - log commit errors in vector layer + New globe navigation controls (partially fixes #6192) -2012-01-15 Juergen E. Fischer +Juergen E. Fischer 2013-07-08 - * i18n/qgis_de.ts: german translation update + ogr provider: avoid GDAL #4509 (fixes #8232) -2012-01-15 Juergen E. Fischer +Juergen E. Fischer 2013-07-08 - * src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h, - src/core/qgspoint.cpp: and followup 84dc1ba5e :( + composer table: + - fix api updates (fixes #7781) + - store/restore geometry of attribute selection dialog -2012-01-15 Juergen E. Fischer +Salvatore Larosa 2013-07-08 - * src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h, - src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h, - src/core/qgsvectorlayer.cpp, src/core/raster/qgsrasterlayer.cpp: - follow up 9a9b53bb: - enable transform caching (comparing before each use disables its - point) - invalidate the render transform cache only when the layer crs - changes by connecting to the QgsMapLayer::layerCrsChanged() signal. - make CRS of map layer private so that setCrs has to be used on - each change + [pyqgis-console][fixes #8230] adds a missing default value in settings -2012-01-15 Juergen E. Fischer +Juergen E. Fischer 2013-07-08 - * src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/providers/grass/qgsgrass.h, - src/providers/spatialite/qgsspatialiteprovider.cpp: fix typos + nodetool: track layer of selected feature instead of current layer (fixes #7351) -2012-01-15 Radim Blazek +Juergen E. Fischer 2013-07-08 - * python/core/qgscoordinatereferencesystem.sip, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, - src/core/qgsmaprenderer.cpp: unset QgsMapRenderer mCachedTrForLayer - on setDestinationCrs and always check layer->crs against mCachedTr - destCRS + help viewer: report errors and make it work from windows build directory -2012-01-15 Sergey Yakushev +Juergen E. Fischer 2013-07-08 - * : commit a6df30c99fd9520a96fa3e8bbed2d78a22e327e3 Author: - Alexander Bruy Date: Sun Jan 15 - 12:35:12 2012 +0200 + fix warnings -2012-01-14 Nathan Woodrow +Juergen E. Fischer 2013-07-08 - * src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: [FEATURE] Add - support to edit views that have triggers. Fixes #4787 + postgres provider: fix some error messages -2012-01-14 Juergen E. Fischer +Werner Macho 2013-07-08 - * src/gui/attributetable/qgsattributetablemodel.cpp, - src/ui/qgsoptionsbase.ui: fix #4812 + translation update: fi by Kari -2012-01-15 Sergey Yakushev +Marco Hugentobler 2013-07-08 - * : commit 89306335ae6a6dda262f6184d350b44ca6a6192b Author: Juergen - E. Fischer Date: Sat Jan 14 17:26:38 2012 +0100 + Merge attributes dialog: also skip pk attributes if taking attributes from selection -2012-01-14 Juergen E. Fischer +Werner Macho 2013-07-07 - * scripts/astyle-all.sh, - src/analysis/raster/qgshillshadefilter.cpp, - src/analysis/raster/qgshillshadefilter.h, - src/analysis/raster/qgsrelief.cpp, src/analysis/raster/qgsrelief.h, - src/app/qgsmaptoolcapture.cpp, src/core/qgsattributeaction.cpp, - src/core/qgsattributeaction.h, src/core/qgsexpression.cpp, - src/core/qgsvectorlayerimport.cpp, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsprojectionselector.cpp, src/gui/qgsprojectionselector.h, - src/gui/qgsscalecombobox.cpp, - src/plugins/gps_importer/qgsgpsplugingui.cpp: indentation update + translation update: es by carlos -2012-01-14 Marco Hugentobler +Juergen E. Fischer 2013-07-07 - * src/mapserver/qgswmsserver.cpp: Fix rounding problem for font size - in GetLegendGraphic + plugin installer: destroy network replies (fixes #8233) -2012-01-14 Marco Hugentobler +Merge: f884f09 ddff4cc +Werner Macho 2013-07-07 - * src/mapserver/qgswmsserver.cpp: Fix for preview symbols in - GetLegendGraphic + Merge pull request #705 from Cracert/trans3 + + translation update: pl -2012-01-14 Marco Hugentobler +Robert Szczepanek 2013-07-07 - * src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: Read - optional legend parameters from GetLegendGraphic request (extension - to WMS) + translation update: pl -2012-01-14 Juergen E. Fischer +Merge: ef07bc3 e35cbcb +Werner Macho 2013-07-06 - * i18n/qgis_de.ts: german translation update + Merge pull request #701 from qgis-jp/make_pull_req_from_ja + + update translation ja include some improvement by Minoru Akagi -2012-01-14 Juergen E. Fischer +Juergen E. Fischer 2013-07-07 - * src/app/CMakeLists.txt, src/app/nodetool/qgsmaptoolnodetool.cpp, - src/app/nodetool/qgsmaptoolnodetool.h, - src/app/nodetool/qgsselectedfeature.cpp, - src/app/nodetool/qgsselectedfeature.h, - src/app/nodetool/qgsvertexentry.cpp, - src/app/nodetool/qgsvertexentry.h, src/app/qgisapp.cpp, - src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolnodetool.h: split - node tool into three class files in a subdirectory + debian packaging update -2012-01-14 Werner Macho +Larry Shaffer 2013-07-06 - * i18n/qgis_es.ts: translation update: es by carlos + Default raster layer icon for when generation of raster legend layer icons is disabled -2012-01-13 Juergen E. Fischer +Larry Shaffer 2013-07-06 - * python/core/qgsvectorlayer.sip, src/app/qgsmaptoolnodetool.cpp, - src/app/qgsmaptoolnodetool.h, src/core/qgsgeometry.cpp, - src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h: more - nodetool speedups & refactoring (fixes #4523) [API] introduce signal - QgsVectorLayer::geometryChanged() signal and use that to reduce the - need to reload the modified geometry. + Switch QGIS Broswer 'set projection' icon to SVG and from 'magic wand' to variation of new CRS icon + + - Make browser toolbar icon size honor app's pref -2012-01-13 Juergen E. Fischer +Larry Shaffer 2013-07-06 - * src/analysis/raster/qgsrelief.cpp: fix warning + Switch custom projection icon to SVG and from 'magic wand' to variation of new CRS icon -2012-01-13 Giuseppe Sucameli +Larry Shaffer 2013-07-06 - * src/providers/postgres/qgspostgresprovider.cpp: use a better - default name for the new pk field when creating a new empty PG table + Switch CRS icon to SVG, simplify it, and update using GIS theme components -2012-01-13 Giuseppe Sucameli +Larry Shaffer 2013-07-06 - * src/core/qgsvectorfilewriter.cpp: cleanup (remove unused line) + Switch icons in custom CRS dialog to be more consistent with rest of app -2012-01-13 Giuseppe Sucameli +Larry Shaffer 2013-07-06 - * src/app/qgsnewspatialitelayerdialog.cpp, - src/app/qgsnewspatialitelayerdialog.h, - src/ui/qgsnewspatialitelayerdialogbase.ui: Remove Apply button from - new spatialite layer dialog, activate add and remove attribute - buttons only when appropriate + Update new selection clearing icons + + - Rebuild using GIS theme components + - Make yellow RGB values match other selection icons -2012-01-13 Giuseppe Sucameli +Larry Shaffer 2013-07-06 - * src/app/qgsattributeactiondialog.cpp, - src/app/qgsattributeactiondialog.h: in actions tab activate buttons - only when appropriate (fixes #4785) + Make lock/unlock icon look less distorted and switch to SVG -2012-01-13 Giuseppe Sucameli +Larry Shaffer 2013-07-06 - * src/core/qgsvectorlayerimport.cpp, - src/core/qgsvectorlayerimport.h: convert field names to lowercase - when importing from shapefile, fix the number of written features, - cleanup the code + Change color of remove icon to red, instead of green -2012-01-13 Alexander Bruy +Larry Shaffer 2013-07-06 - * src/plugins/gps_importer/qgsgpspluginguibase.ui: GPSTools: open - "Load GPX" tab by default + Update new property icons to add whitespace and reduce stroke width + + - New icons now match existing icons' characteristics -2012-01-13 Marco Hugentobler +Marco Hugentobler 2013-07-06 - * src/mapserver/qgsprojectparser.cpp: Avoid second redraw in - GetPrint request + Clean up code related to old overlay object system -2012-01-13 Marco Hugentobler +Marco Hugentobler 2013-07-06 - * src/core/composer/qgscomposermap.cpp: Set composer map projection - earlier (changes in qgsmaprenderer) + Remove diagram_overlay plugin -2012-01-12 Giuseppe Sucameli +yoichigmf 2013-07-06 - * src/providers/postgres/qgspostgresprovider.cpp: fix add features - in PG provider broken in recent refactoring + update translation ja include some improvement by Minoru Akagi -2012-01-12 Juergen E. Fischer +Radim Blazek 2013-07-06 - * ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd: osgeo4w packaging: update to GRASS - 6.4.2RC3 + set provider request attribute supset only if requested, fixes 7112 and 7267 -2012-01-12 Marco Hugentobler +Juergen E. Fischer 2013-07-06 - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp: Append suffix in raster terrain plugin + fix #7217 -2012-01-12 Alexander Bruy +Juergen E. Fischer 2013-07-06 - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp: reapply fix for #4693 (broken in 8ed3e6d68d) + german translation update -2012-01-12 Alexander Bruy +Juergen E. Fischer 2013-07-06 - * src/plugins/gps_importer/qgsgpsplugin.cpp, - src/plugins/gps_importer/qgsgpsplugingui.cpp, - src/plugins/gps_importer/qgsgpsplugingui.h: save last used dirs and - last used filter in GPSTools plugin (fix #1209). Also remember - dialog size and position and restore them (addresses #206) + fix warning -2012-01-12 Juergen E. Fischer +Borys Jurgiel 2013-07-06 - * src/core/qgslogger.cpp: show full filename for debugging in MSVC - again + Update core plugins to use the new icons by default. -2012-01-08 Sergey Yakushev +Radim Blazek 2013-07-05 - * src/plugins/roadgraph/shortestpathwidget.cpp: RoadGraph: fix - export tool. + append required date format to field label in attribute dialog -2012-01-12 Marco Hugentobler +Marco Hugentobler 2013-07-05 - * : commit 878b04843df4babfd4d2856c679255683acbbe12 Author: Marco - Hugentobler Date: Thu Jan 12 - 11:48:11 2012 +0100 + Fix #8225 -2012-01-12 mhugent +Radim Blazek 2013-07-05 - * : Merge pull request #85 from mbernasocchi/android fixing execinfo.h no such file or directory on android + add spacer to keep attributes on top -2012-01-12 Marco Hugentobler +Werner Macho 2013-07-05 - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp, src/plugins/raster_terrain_analysis/qgsreliefdialog.cpp, - src/plugins/raster_terrain_analysis/qgsreliefdialog.h, - src/plugins/raster_terrain_analysis/qgsreliefdialogbase.ui: Raster - category, remove obsolete files + translation update: nl and no -2012-01-12 Marco Hugentobler +Werner Macho 2013-07-04 - * src/analysis/CMakeLists.txt, - src/analysis/raster/qgsaspectfilter.h, - src/analysis/raster/qgsderivativefilter.cpp, - src/analysis/raster/qgsderivativefilter.h, - src/analysis/raster/qgshillshadefilter.cpp, - src/analysis/raster/qgshillshadefilter.h, - src/analysis/raster/qgsninecellfilter.cpp, - src/analysis/raster/qgsninecellfilter.h, - src/analysis/raster/qgsrelief.cpp, src/analysis/raster/qgsrelief.h, - src/analysis/raster/qgsruggednessfilter.cpp, - src/analysis/raster/qgsruggednessfilter.h, - src/analysis/raster/qgsslopefilter.cpp, - src/analysis/raster/qgsslopefilter.h, - src/analysis/raster/qgstotalcurvaturefilter.cpp, - src/analysis/raster/qgstotalcurvaturefilter.h, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - h, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogb - ase.ui, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - h, src/plugins/raster_terrain_analysis/qgsreliefdialog.cpp, - src/plugins/raster_terrain_analysis/qgsreliefdialog.h, - src/plugins/raster_terrain_analysis/qgsreliefdialogbase.ui: - [FEATURE]: relief and hillshade function, modification of raster - terrain structure + translation update: ja and da_DK thanks to contributors -2012-01-12 Juergen E. Fischer +Merge: e53aa07 286f62c +Werner Macho 2013-07-04 - * i18n/qgis_de.ts: german translation update + Merge pull request #699 from qgis-jp/make_pull_req_from_ja + + update GUI translation ja -2012-01-12 Werner Macho +Matthias Kuhn 2013-07-04 - * i18n/qgis_es.ts: translation update: es by carlos + Merge features: Fix "take attributes from selected feature" + Fix #7668 + Fix #7922 -2012-01-12 Juergen E. Fischer +yoichigmf 2013-07-05 - * src/app/qgsattributetabledialog.cpp, - src/app/qgsattributetabledialog.h, src/core/qgsvectorlayer.cpp, - src/gui/attributetable/qgsattributetablefiltermodel.h, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetablemodel.h, - src/providers/memory/qgsmemoryprovider.cpp: fix #4636: - add a column containing the feature id, if no columns are there - (otherwise there are no valid model indices) - vector layer: emit featureDeleted and featureAdded signals, when - added features change their temporary to a permanent id (e.g. makes - the now defunct rows in the attribute table disappear, instead of - showing ERROR) - memory provider: update the feature id in added features + update GUI translation ja -2012-01-12 Juergen E. Fischer +Merge: c3143e6 7221c73 +Matthias Kuhn 2013-07-04 - * src/providers/postgres/qgspostgresconn.cpp: apply #4167 + Merge pull request #695 from minorua/defproj + + fTools: remove lines that cause error with non-ascii path -2012-01-11 Juergen E. Fischer +Werner Macho 2013-07-04 - * src/core/qgis.h, src/core/qgsdatasourceuri.cpp, - src/core/qgsdatasourceuri.h, - src/providers/postgres/qgscolumntypethread.h, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspgtablemodel.h, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: postgres provider: - base geometrytype filtering on GeometryType not WkbType - use tooltips on dataitems - fix #4783 - adapt #4767 + fixing tips - thanks to Richard for pointing to it -2012-01-11 Juergen E. Fischer +Juergen E. Fischer 2013-07-04 - * src/ui/qgsattributeactiondialogbase.ui: fix warning + spit: fix truncation issue -2012-01-11 Giuseppe Sucameli +Merge: 5fcd054 5b2e9dc +Nathan Woodrow 2013-07-04 - * src/app/qgisapp.cpp: enable (or disable) "feature action" tool - after adding (or removing) actions + Merge pull request #693 from 3nids/selectsvgicon + + SVG for select icons -2012-01-11 Giuseppe Sucameli +Merge: 1b0dbc8 3331069 +Nathan Woodrow 2013-07-04 - * src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgisappinterface.cpp, src/app/qgisappinterface.h, - src/app/qgsmaptoolfeatureaction.cpp, - src/app/qgsmaptoolfeatureaction.h, src/core/qgsattributeaction.h, - src/ui/qgisapp.ui: [FEATURE] add "feature action" map tool to run - actions directly when clicking on features (fix #119 and #4262) work - done for Regione Toscana-SIGTA + Merge pull request #692 from 3nids/moresvgicons + + SVG for system and general icons -2012-01-11 Giuseppe Sucameli +Merge: eeb2cb4 a7854ff +Werner Macho 2013-07-04 - * src/app/qgsattributeactiondialog.cpp, - src/app/qgsattributeactiondialog.h, src/app/qgsfeatureaction.cpp, - src/app/qgsidentifyresults.cpp, src/core/qgsattributeaction.cpp, - src/core/qgsattributeaction.h, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetablemodel.h, - src/ui/qgsattributeactiondialogbase.ui: [FEATURE] use expressions - engine to evaluate feature actions work done for Regione - Toscana-SIGTA + Merge pull request #696 from asiersarasua/master + + Basque translation update -2012-01-11 Giuseppe Sucameli +asiersarasua 2013-07-04 - * src/ui/qgsattributeactiondialogbase.ui: make "action" tab less - confusing (partially fix #4211): display add and update buttons - below the edit action widget (following the "new shapefile" UI - style) move the "capture output" checkbox away from the "insert - field" combo + Basque translation update -2012-01-04 Giuseppe Sucameli +Minoru Akagi 2013-07-04 - * src/app/qgsattributeactiondialog.cpp: in the action dialog update - the capture checkbox state when populating edit section + fTools: remove lines that cause error with non-ascii path -2012-01-04 VKa +Werner Macho 2013-07-04 - * python/plugins/fTools/tools/doGeoprocessing.py: Fix Union tool to - produce correct attribute table (fix #4567) + Fixing some typos -2012-01-11 Alexander Bruy +Merge: 7805af3 ea5d3b3 +Werner Macho 2013-07-03 - * - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog. - cpp: always save last used dir in Raster terrain analysis plugin - (fix #4693) + Merge pull request #694 from Jean-Roc/mywork + + update french translation -2012-01-11 Marco Bernasocchi +Denis Rouzaud 2013-07-03 - * src/app/main.cpp: fixing execinfo.h no such file or directory on - android + SVG for select icons -2012-01-10 Nathan Woodrow +Juergen E. Fischer 2013-07-04 - * : Merge pull request #84 from mbernasocchi/android FIX #4201 + crssync: exclude some records from updates from GDAL + + sqlite3 resources/srs.db + sqlite> alter table tbl_srs add noupdate boolean; + sqlite> update tbl_srs set noupdate=(auth_name='EPSG' and auth_id in (5513,5514,5221,2065,102067,4156,4818)); -2012-01-10 Juergen E. Fischer +Jean-Roc Morreale 2013-07-04 - * images/images.qrc, images/themes/default/CMakeLists.txt, - src/app/main.cpp, src/app/qgisapp.cpp, - src/gui/qgsmessagelogviewer.cpp, src/gui/qgsmessagelogviewer.h: - [FEATURE] add status bar tool button that toggles visibility of - message log and show tooltips when messages appear while message log - is hidden + update french translation -2012-01-10 Juergen E. Fischer +Victor Olaya 2013-07-03 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider - fixes + [sextante] fixed graticule creation algorithm -2012-01-10 Alexander Bruy +Victor Olaya 2013-07-03 - * src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp: don't - overwrite existing classes when reclassify in graduated symbol - renderer. Also always add default value and use it for all - unclassified values (fixes #2709) + [sextante]Some algorithm renaming -2012-01-09 Sandro Santilli +Victor Olaya 2013-07-03 - * src/providers/postgres/qgspostgresprovider.cpp: Use - ST_MakeEnvelope with PostGIS 2.0+ to build query rectangle + [sextante]adapted SAGA export procedure to SAGA 2.1 -2012-01-10 Tim Sutton +Victor Olaya 2013-07-03 - * : Merge pull request #74 from mbernasocchi/android added QScrollarea to new spatialite dialog + [sextante] minor changes in algorithms -2012-01-10 Alexander Bruy +Matthias Kuhn 2013-07-03 - * python/gui/gui.sip, python/gui/qgsscalecombobox.sip, - src/app/qgisapp.cpp, src/app/qgisapp.h, src/gui/CMakeLists.txt, - src/gui/qgsscalecombobox.cpp, src/gui/qgsscalecombobox.h: move map - scale selector to QgsScaleComboBox class. Highlight nearest value to - the current scale when open selectors popup + More const-correctness -2012-01-10 Juergen E. Fischer +Werner Macho 2013-07-03 - * CMakeLists.txt: don't require webkit when desktop is not built - (refers #4756) + translation update: es by Carlos -2012-01-10 Werner Macho +Matthias Kuhn 2013-07-03 - * i18n/qgis_es.ts: translation update: es by carlos + Let python utils manage all python cleanup -2012-01-10 Juergen E. Fischer +Werner Macho 2013-07-03 - * i18n/qgis_de.ts, src/app/main.cpp, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatetransform.cpp, - src/core/raster/qgsrasterlayer.cpp: - log addition of user coordinate systems - include proj.4 definitions in CRS exceptions - raster layer: catch exception on extent transformation errors - (fixes freeze in #4583) + translation update: danish by Jacob -2012-01-09 Juergen E. Fischer +Werner Macho 2013-07-03 - * src/app/qgsmaptoolcapture.cpp, - src/providers/grass/qgsgrassprovider.cpp: fix vc warnings + Bugfixing typos, thanx to Carlos Davila for pointing them out -2012-01-09 Juergen E. Fischer +Merge: d2b2bb1 6a2bd62 +Etienne Tourigny 2013-07-03 - * src/plugins/spit/CMakeLists.txt, - src/providers/postgres/qgspostgresconn.cpp: add missing postgres - provider symbol and link spit with QgsPostgresConn + Merge pull request #429 from tecoholic/ramp_srch + + added searching of colorramps in style manager -2011-12-29 Juergen E. Fischer +Denis Rouzaud 2013-07-03 - * src/app/legend/qgslegendlayer.cpp, src/core/CMakeLists.txt, - src/core/qgis.h, src/core/qgsdatasourceuri.cpp, - src/core/qgsdatasourceuri.h, src/core/qgsdbtablemodel.cpp, - src/core/qgsdbtablemodel.h, src/providers/postgres/CMakeLists.txt, - src/providers/postgres/create_test_tables, - src/providers/postgres/qgscolumntypethread.cpp, - src/providers/postgres/qgscolumntypethread.h, - src/providers/postgres/qgsdbfilterproxymodel.cpp, - src/providers/postgres/qgsdbfilterproxymodel.h, - src/providers/postgres/qgspgnewconnection.cpp, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspgtablemodel.cpp, - src/providers/postgres/qgspgtablemodel.h, - src/providers/postgres/qgspostgresconn.cpp, - src/providers/postgres/qgspostgresconn.h, - src/providers/postgres/qgspostgresconnection.cpp, - src/providers/postgres/qgspostgresconnection.h, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h, - tests/testdata/create_test_tables: [FEATURE][API] postgres provider - refactoring: - use m prefix for member variables and s prefix for class variables - refactor QgsPostgresProvider::Conn and QgsPostgresConnection to - QgsPostgresConn - put QgsColumnTypeThread into separate file - use QgsPostgresConn in QgsPgSourceSelect - cleaner abort of column type thread (e.g. remove unfinished - columns from selection list) - [API] move QgsDbTableModel as QgsPgTableModel to provider - [FEATURE] support for arbitrary key (including non-numeric and - multi column) - [FEATURE][API] support for requesting a certain geometry type - and/or srid in QgsDataSourceURI * no more explicit filter strings * support for empty tables without gemetry_columns entry or - GEOMETRY type. + added folder for base SVG images (hammer, pointer, scredriver, etc.) -2012-01-09 Juergen E. Fischer +Denis Rouzaud 2013-07-03 - * src/core/qgsvectorlayer.cpp: QgsVectorLayer: - boundingBoxOfSelected() iterate only selected feature with - featureAtId where available - identify unknown extents in metadata + more SVG icons -2011-12-28 Juergen E. Fischer +Matthias Kuhn 2013-07-03 - * i18n/qgis_de.ts: german translation update + fix editable attribute of joined fields (fix #7739) + Based on pull request 576 by minorua -2012-01-09 Werner Macho +Nathan Woodrow 2013-07-03 - * i18n/qgis_fr.ts: translation update: fr by JRM + Fix windows build -2012-01-09 Juergen E. Fischer +Matthias Kuhn 2013-07-03 - * CMakeLists.txt, src/plugins/CMakeLists.txt, - src/plugins/gps_importer/CMakeLists.txt: fix 8a2ea36a + Followup f3e08b5: Actually clean python on systems with newer sip version -2012-01-07 Juergen E. Fischer +Matthias Kuhn 2013-07-03 - * src/app/qgsattributetabledialog.cpp, - src/app/qgsattributetabledialog.h, src/browser/qgsbrowser.cpp, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/attributetable/qgsattributetablememorymodel.h, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetablemodel.h, - src/gui/attributetable/qgsattributetableview.cpp, - src/gui/attributetable/qgsattributetableview.h: [FEATURE] make - loading attributes interruptable - also show progress - fix tracking of canvas extent (OTFR wasn't considered) + Only cleanup python with newer sip versions (Fix #8102) -2012-01-08 Juergen E. Fischer +Merge: 7d75fcc 3851670 +Nathan Woodrow 2013-07-03 - * cmake_templates/qgsconfig.h.in, src/core/qgslogger.cpp, - src/core/qgslogger.h: strip toplevel directory from debugging output + Merge pull request #689 from 3nids/svgactionicons + + use SVG for action icons -2012-01-08 Juergen E. Fischer +Denis Rouzaud 2013-07-03 - * python/core/qgsfeature.sip: fix sip bindings + use SVG for action icons -2012-01-09 Juergen E. Fischer +Minoru Akagi 2013-07-03 - * CMakeLists.txt, src/CMakeLists.txt, src/plugins/CMakeLists.txt, - src/plugins/georeferencer/CMakeLists.txt, - src/plugins/gps_importer/CMakeLists.txt: [FEATURE] make desktop - build optional (but default; fixes #4756) + fTools: fix MergeShapes and SpatialJoin + fix #7823 + fix #7952 + fix #8206 -2012-01-08 Juergen E. Fischer +Merge: ce1a9a8 b0ef70b +Werner Macho 2013-07-02 - * src/core/qgsexpression.cpp: fix #4622 + Merge pull request #687 from qgis-jp/make_pull_req_from_ja + + Make pull req from ja -2012-01-07 Juergen E. Fischer +yoichigmf 2013-07-02 - * src/core/qgsexpression.h, src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfsutils.cpp, src/ui/qgsoptionsbase.ui, - src/ui/qgsprojectpropertiesbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui: fix windows build and some - warnings + update GUI translation JA -2012-01-07 Nathan Woodrow +Merge: 03c1cec ce1a9a8 +yoichigmf 2013-07-02 - * src/gui/qgsexpressionhighlighter.cpp: Add highlighting for CASE - condition; make regex for quote matching less greedy + Merge branch 'master' of https://github.com/qgis/Quantum-GIS into make_pull_req_from_ja + + Conflicts: +i18n/qgis_ja.ts -2012-01-07 Martin Dobias +Matthias Kuhn 2013-07-02 - * python/core/qgsexpression.sip, src/core/qgsexpression.cpp, - src/core/qgsexpression.h, src/core/qgsexpressionlexer.ll, - src/core/qgsexpressionparser.yy, src/providers/wfs/qgswfsutils.cpp, - tests/src/core/testqgsexpression.cpp: Expressions - conditional - expressions (CASE) Right now only without "base" expression: CASE WHEN cond1 THEN exp1 - [WHEN cond2 THEN exp2]* [ELSE exp3] END + Topology checker: No double-delete of rubberbands (Fix #8095) -2012-01-06 Martin Dobias +Werner Macho 2013-07-02 - * python/plugins/plugin_installer/installer_gui.py, - python/plugins/plugin_installer/installer_plugin.py: plugin - installer: use default flags (do not exclude close button) + Translation String update for upcoming 2.0 Release -2012-01-06 Martin Dobias +Werner Macho 2013-07-02 - * python/core/qgsexpression.sip, src/core/qgsexpression.cpp, - src/core/qgsexpression.h, src/gui/qgssearchquerybuilder.cpp, - src/providers/wfs/CMakeLists.txt, - src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsutils.cpp, src/providers/wfs/qgswfsutils.h: - Expressions: support for visitor pattern, expresion->OGCFilter now a - visitor + translation update: es by Carlos -2011-12-27 Richard Duivenvoorde +Merge: 3ba1c3c ad01416 +Nathan Woodrow 2013-07-01 - * src/gui/qgsprojectionselector.cpp, - src/gui/qgsprojectionselector.h: better fix for #4550 change - itemchanged event for simple clicked event (also should fix #4748) + Merge pull request #685 from 3nids/identifyicon + + SVG icon for identify action -2012-01-06 Alexander Bruy +Nathan Woodrow 2013-07-02 - * src/gui/qgsprojectionselector.cpp: fix #4748 + Use qRound. Fix windows build -2012-01-06 Nathan Woodrow +Nathan Woodrow 2013-07-02 - * src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp, - src/core/qgspallabeling.h, src/ui/qgslabelingguibase.ui: [FEATURE] - Add label wrapping on character. Semi Fixes #3284 + Use extents table for ms sql layers for faster loading + + - Also move feature count logic -2012-01-05 Marco Bernasocchi +Victor Olaya 2013-07-01 - * : commit 3f73c859c3205f13479967f9174859cab66c72e8 Author: Sergey - Yakushev Date: Fri Jan 6 01:21:38 2012 +0600 + [sextante] fixed some minor bugs due to new SIP API -2012-01-05 Nathan Woodrow +Denis Rouzaud 2013-07-01 - * src/ui/qgsexpressionbuilder.ui: Remove border from expression - builder output area + replace identify icon by svg -2012-01-05 Werner Macho +yoichigmf 2013-07-01 - * i18n/qgis_pt_BR.ts: translation update: pt_BR by arthur + update GUI translatio ja -2012-01-04 Juergen E. Fischer +Nyall Dawson 2013-07-01 - * src/core/qgsgeometryvalidator.h, src/providers/grass/qgsgrass.cpp: - fix windows build + Follow up to 4240807 -2012-01-04 Martin Dobias +Nyall Dawson 2013-06-30 - * src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h: Do not use - automatic grouping anymore + Fix dimension calculation in heatmap plugin (fix #8193) -2012-01-04 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/app/main.cpp, src/core/qgsapplication.cpp, - src/core/qgsapplication.h, src/core/qgslogger.cpp: debugging - improvements: - use versioned class variables in QgsApplication (multiple version - of qgis_core don't conflict) - QgsLogger: log message to file before writing before invoking the - message handler - on linux: produce backtrace on fatal errors + fix #8165 -2012-01-04 Juergen E. Fischer +Merge: 92b930a 7e00e7b +volaya 2013-06-30 - * src/app/qgsattributetabledialog.cpp, - src/gui/attributetable/qgsattributetablemodel.cpp: fix #4690 + Merge pull request #677 from radosuav/r_report_fix + + Save SEXTANTE GRASS r.report output in HTML -2012-01-04 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolnodetool.h: - nodetool fixes (fixes #4523, #4737 & #4738) + projection selector: skip unavailable user CRSes (fixes #7377) -2012-01-04 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolnodetool.h: node - tool: only draw vertex markers in the current canvas (refers to - #4523) + ows data items: populate data items of other providers (fixes #7857) -2012-01-03 Juergen E. Fischer +Werner Macho 2013-06-30 - * src/gui/attributetable/qgsattributetablemodel.cpp: fix #4732 + translation update: gl_ES by Xan -2012-01-03 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * i18n/qgis_de.ts: german translation update + project properties: rename wfs slots to avoid autoconnect warning -2012-01-03 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * python/plugins/fTools/tools/doValidate.py, src/app/main.cpp, - src/app/qgsmaptoolcapture.cpp, src/app/qgsmaptoolcapture.h, - src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolnodetool.h, - src/app/qgsoptions.cpp, src/core/CMakeLists.txt, - src/core/qgsapplication.cpp, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscoordinatereferencesystem.h, src/core/qgsgeometry.cpp, - src/core/qgsgeometry.h, src/core/qgsgeometryvalidator.cpp, - src/core/qgsgeometryvalidator.h, src/core/qgsmaprenderer.cpp, - src/core/qgsmaprenderer.h, src/core/qgspoint.cpp, - src/plugins/coordinate_capture/coordinatecapture.cpp, - src/plugins/gps_importer/qgsgpsplugin.cpp, - src/plugins/gps_importer/qgsgpsplugingui.cpp, - src/ui/qgsoptionsbase.ui: fix #4523: - make geometry validation optional: none, QGIS and GEOS - move internal validation to QgsGeometryValidator thread - cache wkt in QgsCoordinateReferenceSystem - fTools: leave progress of geometry validatation at 100% - move coordinate capture to vector menu + spelling fixes -2012-01-02 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/app/qgisapp.cpp: missed a file in last commit + grass provider: don't close invalid layers (fixes #7180) -2012-01-02 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/app/CMakeLists.txt, - src/app/attributetable/qgsattributetabledialog.cpp, - src/app/attributetable/qgsattributetabledialog.h, - src/app/qgsattributetabledialog.cpp, - src/app/qgsattributetabledialog.h, - src/app/qgsnewspatialitelayerdialog.cpp, - src/app/qgsnewspatialitelayerdialog.h, - src/app/spatialite/qgsnewspatialitelayerdialog.cpp, - src/app/spatialite/qgsnewspatialitelayerdialog.h, - src/gui/attributetable/qgsattributetablemodel.cpp: - fix #4732 - move contents of src/app/attributetable and src/app/spatialite up - one level (there was only one class in each directory left) + QgsGml: append wkb fragments to the last set not the first (fixes #7991) -2012-01-02 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * src/providers/grass/qgsgrass.cpp: fix #4736 + german translation update -2012-01-02 Werner Macho +Juergen E. Fischer 2013-06-30 - * : Merge pull request #80 from Jean-Roc/master update fr strings + expression builder widget: hide sample buttons and context menu, when no layer is set (fixes #6802) + wfs source select: rename slots to avoid autoconnect warning + attribute table: remove stale connect -2011-12-31 Giuseppe Sucameli +Juergen E. Fischer 2013-06-30 - * src/app/qgsidentifyresults.cpp: fix invalid list index in identify - results causing wrong result or segfault accessing actions from - context menu + wfs connection dialog: also hide pixmap transformation checkbox + ows source select: remove unused slot -2011-12-29 Juergen E. Fischer +Juergen E. Fischer 2013-06-30 - * python/core/qgsvectorlayer.sip, - src/app/qgsattributetypedialog.cpp, - src/app/qgsvectorlayerproperties.cpp, src/core/qgsvectorlayer.cpp, - src/core/qgsvectorlayer.h, src/gui/qgsattributeeditor.cpp, - src/providers/postgres/qgspostgresprovider.cpp, - src/ui/qgsattributetypeedit.ui: [FEATURE] add uuid generator widget + don't crash when measuring faulty geometry (fixes partially #7991) -2011-12-30 Nathan Woodrow +Merge: 5d60f60 7d3461d +Werner Macho 2013-06-29 - * src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionhighlighter.cpp: Wrap field name in quotes when - added to expression string + Merge pull request #683 from rduivenvoorde/nltranslation + + dutch translation update -2011-12-30 Nathan Woodrow +Tim Sutton 2013-06-30 - * : commit 3c9d1a3f7472855718def0ae197070f530676b46 Author: Nathan - Woodrow Date: Wed Dec 28 11:21:22 2011 - +1000 + Added Denis Rouzaud to contributors and sorted contributor list alphabetically -2011-12-29 Nathan Woodrow +Richard Duivenvoorde 2013-06-29 - * src/gui/CMakeLists.txt, src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/gui/qgsexpressionhighlighter.cpp, - src/gui/qgsexpressionhighlighter.h: Added basic highlighter for - QgsExpression in expression builder widget + dutch translation update -2011-12-29 Alexander Bruy +Juergen E. Fischer 2013-06-29 - * src/app/legend/qgslegend.cpp: add new group after current item + fix #7865 -2011-12-29 Alexander Bruy +Juergen E. Fischer 2013-06-29 - * src/app/legend/qgslegend.cpp: insert new layer before selected - layer + fix #8198 -2011-12-29 Tim Sutton +Juergen E. Fischer 2013-06-29 - * tests/testdata/lines.qml, tests/testdata/points.qml, - tests/testdata/polys.qml: Fix style classes which lost their - attribute association for some reason + postgres provider: remove attribute in reverse order (fixes #8142) -2011-12-28 Werner Macho +Juergen E. Fischer 2013-06-29 - * i18n/qgis_et.ts: translation update: et by veiko + save and restore message viewer geometry -2011-12-28 Giuseppe Sucameli +Merge: 376c5f3 5ee134f +Werner Macho 2013-06-29 - * src/core/qgscoordinatereferencesystem.cpp: split proj4string on - spaces followed by '+' (instead of spaces only). see - http://trac.osgeo.org/proj/ticket/132 + Merge pull request #682 from qgis-jp/make_pull_req_from_ja + + update GUI translation ja -2011-12-28 Nathan Woodrow +yoichigmf 2013-06-29 - * src/app/qgslabelinggui.cpp, - src/gui/qgsexpressionbuilderdialog.cpp, - src/gui/qgsexpressionbuilderdialog.h, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/providers/wfs/qgswfssourceselect.cpp: Refector - QgsExpressionBuilderWidget to add API for loading field names; - update uses of widget to use new API + update GUI translation ja -2011-12-28 Alexander Bruy +Juergen E. Fischer 2013-06-29 - * src/app/qgsaddattrdialog.cpp, src/app/qgsaddattrdialog.h: show - warning when user tried to create field 'shape' in shapefile (fix - #3201) + new spatialite layer: don't assume epsg id and qgis srsid are the same (fixes #8041) -2011-12-27 Werner Macho +Borys Jurgiel 2013-06-29 - * i18n/qgis_es.ts, i18n/qgis_pl_PL.ts: translation update: pl by - robert (and string updates for pl and es) + [Plugin Installer] Follow up 619558dabc -2011-12-27 Werner Macho +Juergen E. Fischer 2013-06-29 - * i18n/qgis_es.ts: translation update: es by carlos + use QFileDialog.getOpenFileNameAndFilter variant when setting last filter (fixes #8138) -2011-12-27 Tim Sutton +Juergen E. Fischer 2013-06-29 - * INSTALL, doc/osx.t2t: Use proper QGIS acronym (instead of Qgis) - for OSX install notes + enable/disable raster tools (fixes #8179) -2011-12-27 Alexander Bruy +Merge: 8dc28f2 f4a4009 +Tim Sutton 2013-06-29 - * src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: fix - windows build + Merge pull request #681 from 3nids/maptoolcursor + + set cursor for mapTools -2011-12-27 Juergen E. Fischer +Matthias Kuhn 2013-06-28 - * src/providers/ogr/qgsogrprovider.cpp: ogr provider: - support for OLCStringsAsUTF8 (fixes #4558) - remove quotation on "ORDER BY" (produces a syntax error otherwise) - support for null values in uniqueValues/minimumValue/maximumValue + PostgreSQL not working in DB Manager (Fix #8191) -2011-12-27 Juergen E. Fischer +Borys Jurgiel 2013-06-28 - * src/gui/qgsquerybuilder.cpp: query builder: support null values - in values lists + Update contributors list -2011-12-27 Juergen E. Fischer +Merge: 93c5599 e00f0c0 +Marco Hugentobler 2013-06-28 - * src/analysis/interpolation/ParametricLine.cc, - src/app/legend/qgslegend.cpp, src/app/qgslabelinggui.cpp, - src/core/composer/qgscomposermap.h, src/core/qgsapplication.cpp, - src/core/qgsapplication.h, src/core/qgscoordinatetransform.cpp, - src/core/qgsmaptopixel.h, src/core/qgsmessagelog.cpp, - src/core/qgsmessagelog.h, src/core/raster/qgsrasterlayer.h, - src/core/symbology-ng/qgsrendererv2.cpp, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/qgsattributeeditor.cpp, - src/gui/qgsdetaileditemdelegate.cpp, src/gui/qgsmapcanvas.cpp, - src/gui/qgsprojectionselector.h, - src/plugins/gps_importer/qgsgpsdevicedialog.cpp: indentation update + Merge branch 'server_user_db' -2011-12-25 Juergen E. Fischer +Marco Hugentobler 2013-06-28 - * i18n/qgis_de.ts: german translation update + Initialize qgis.db in server. Fixes ticket #8172 -2011-12-27 Alexander Bruy +Denis Rouzaud 2013-06-28 - * src/app/legend/qgslegend.cpp, src/ui/qgsoptionsbase.ui: add layers - to group even group is not selected but selected child item in this - group + set cursor for mapTools -2011-12-27 Marco Hugentobler +Juergen E. Fischer 2013-06-28 - * src/app/qgisapp.cpp, src/providers/wfs/qgswfsdata.cpp, - src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfsprovider.h, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h, - src/ui/qgswfssourceselectbase.ui: Improve incremental WFS fetch. - Patch from Bill Clay from ticket 4604 + revert unnecessary api change -2011-12-26 William Kyngesburye +Werner Macho 2013-06-28 - * : commit bdd33b3048dc734d82367354211ba29167f0e247 Author: William - Kyngesburye Date: Mon Dec 26 12:21:34 - 2011 -0600 + translation update: TW by Lin -2011-12-26 Alexander Bruy +Merge: c8d3fa7 9a0be04 +Nathan Woodrow 2013-06-27 - * src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h: support for cyrillic symbols - in raster metadata (fix #4452) + Merge pull request #680 from ddanielvaz/master + + Fix #7822. Export to Spatialite is really slow, compared to commandline ogr2ogr -2011-12-26 Alexander Bruy +Daniel Vaz 2013-06-27 - * src/app/qgisapp.cpp, src/app/qgisapp.h: sort panels alphabeticaly - in context menu + fixing bug #7822 -2011-12-26 William Kyngesburye +Giuseppe Sucameli 2013-06-27 - * mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in: missed a few - quotings + gdaltools: fix Translate/FillNodata batch mode (follo df4fc99e83) -2011-12-26 William Kyngesburye +Giuseppe Sucameli 2013-06-27 - * cmake/MacBundleMacros.cmake, mac/cmake/1qt.cmake.in: more quoting - in case there are empty variables, and tests for existence of files - before executing commands + gdaltools: fix syntax error (follow edd0cdd294) -2011-12-25 Juergen E. Fischer +Giuseppe Sucameli 2013-06-27 - * src/ui/qgssymbolv2selectordialogbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui, - src/ui/symbollayer/widget_fontmarker.ui, - src/ui/symbollayer/widget_linedecoration.ui, - src/ui/symbollayer/widget_linepatternfill.ui, - src/ui/symbollayer/widget_markerline.ui, - src/ui/symbollayer/widget_pointpatternfill.ui, - src/ui/symbollayer/widget_simplefill.ui, - src/ui/symbollayer/widget_simpleline.ui, - src/ui/symbollayer/widget_simplemarker.ui, - src/ui/symbollayer/widget_svgfill.ui, - src/ui/symbollayer/widget_svgmarker.ui: implement #4217 + gdaltools: cleanup -2011-12-25 Juergen E. Fischer +Giuseppe Sucameli 2013-06-27 - * src/gui/qgsquerybuilder.cpp: fix #4305 + gdaltools: more SIP APIv2 update -2011-12-25 Juergen E. Fischer +Giuseppe Sucameli 2013-06-27 - * python/core/qgsnetworkaccessmanager.sip: fix sip annotation + gdaltools: SIP APIv2 update (error when paths defined in Settings dialog) -2011-12-25 William Kyngesburye +Borys Jurgiel 2013-06-27 - * cmake/MacBundleMacros.cmake, mac/cmake/2lib.cmake.in: don't create - framework folders if framework does not exist; quote library names - for IF test + [Plugin Installer] Only test not loaded Python plugins when (re)building metadata registry. Loaded plugins prove they are ok just being loaded. It prevents possible bugs when already loaded plugin is imported again. -2011-12-24 Juergen E. Fischer +Borys Jurgiel 2013-06-27 - * src/app/qgsmaptoolidentify.cpp, - src/providers/gdal/qgsgdalprovider.cpp: fix #4371 + [Plugin Manager] Fix inconsistent behaviour in --noplugins mode: don't try to load plugins, just enable/disable them in QSettings. -2011-12-24 Juergen E. Fischer +Werner Macho 2013-06-27 - * src/core/qgsvectorlayer.cpp: fix #4402 + translation update: slovenian by Joze -2011-12-24 Juergen E. Fischer +rmgu 2013-06-27 - * cmake/SIPMacros.cmake, python/analysis/analysis.sip, - python/core/core.sip, python/core/qgsvectordataprovider.sip, - python/core/symbology-ng-core.sip: update for sip 4.13 + Allow value checking and the use of default value for ParameterExtent -2011-12-24 Juergen E. Fischer +Marco Hugentobler 2013-06-27 - * src/app/gps/qgsgpsinformationwidget.cpp, - src/core/gps/qextserialport/qextserialenumerator.cpp, - src/core/gps/qgsgpsdetector.cpp, - src/ui/qgsgpsinformationwidgetbase.ui: fix #3185 and #4689 + Fix for SVG cache -2011-12-24 Juergen E. Fischer +Matthias Kuhn 2013-06-27 - * src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: fix #3963 + Change default: Don't generate raster thumbnail for legend (Fix #8175) -2011-12-24 Juergen E. Fischer +Marco Hugentobler 2013-06-27 - * src/app/qgsbrowserdockwidget.cpp, - src/plugins/roadgraph/shortestpathwidget.cpp: fix runtime warnings + Fix crash if merge geometries fails -2011-12-23 Juergen E. Fischer +Merge: 0cac8b4 6809626 +Werner Macho 2013-06-26 - * src/gui/attributetable/qgsattributetablemodel.cpp: fix #4646 + Merge pull request #679 from Jean-Roc/mywork + + update french translation (contributions from @MarieSilvestre) -2011-12-23 Juergen E. Fischer +Jean-Roc Morreale 2013-06-27 - * src/app/attributetable/qgsattributetabledialog.cpp, - src/app/gps/qgsgpsinformationwidget.cpp, - src/app/qgisappinterface.cpp, src/app/qgsfeatureaction.cpp, - src/app/qgsfeatureaction.h, src/app/qgsidentifyresults.cpp, - src/app/qgsmaptooladdfeature.cpp, src/core/qgsattributeaction.cpp: - fix #4478 + update french translation (contributions from @MarieSilvestre) -2011-12-23 Juergen E. Fischer +Nyall Dawson 2013-06-27 - * src/app/legend/qgslegend.cpp: disable rendering while legend group - is removed + Standardise control names in heatmap dialog -2011-12-23 Juergen E. Fischer +Nyall Dawson 2013-06-27 - * src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp: fix - #4694 + Save heatmap settings between runs (fix #8078) -2011-12-23 Alexander Bruy +Nyall Dawson 2013-06-27 - * src/app/qgisapp.cpp: always create Database menu after Raster one + Only allow choice of heatmap raster formats which support Float32 data types -2011-12-23 Alexander Bruy +Nyall Dawson 2013-06-27 - * python/plugins/mapserver_export/__init__.py, - python/plugins/mapserver_export/mapserverexport.py, - python/plugins/osm/OsmPlugin.py, python/plugins/osm/__init__.py: - move MapServer export and OSM plugins to Web menu + Don't reset output size on radius change (fix #8090) + Prevent input of invalid output size by changing to spin boxes for rows and columns -2011-12-23 Alexander Bruy +Werner Macho 2013-06-26 - * python/gui/qgisinterface.sip, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgisappinterface.cpp, - src/app/qgisappinterface.h, src/gui/qgisinterface.h, - src/ui/qgisapp.ui: added Web menu and toolbar for plugins + translation update: ko_KR -2011-12-23 Alexander Bruy +Marco Hugentobler 2013-06-26 - * python/plugins/fTools/tools/doDefineProj.py: [BACKPORT] display - CRS in fTools as authid-description pair + Fix dash pattern for line width < 1 pixels in Qt 4.8 -2011-12-23 Alexander Bruy +Merge: afbc9b8 a13126c +Borys Jurgiel 2013-06-26 - * python/gui/qgsgenericprojectionselector.sip: [BACKPORT] update - QgsGenericProjectionSelector bindings + Merge pull request #678 from minorua/ogr_init_enc_chk + + OgrProvider: initial encoding setting check (fix #8167) -2011-12-23 Alexander Bruy +Minoru Akagi 2013-06-26 - * src/gui/qgsnewvectorlayerdialog.cpp: [BACKPORT] don't ask for CRS - when opening New Shapefile dialog (fix #4379) + OgrProvider: initial encoding setting check (fix #8167) -2011-12-23 Alexander Bruy +Borys Jurgiel 2013-06-26 - * src/app/spatialite/qgsnewspatialitelayerdialog.cpp: [BACKPORT] add - extension to new SpatiaLite database if user ommits it + [Plugin Installer] partially revert fd2b221e65 . Still QGIS restart is needed after plugin update in some cases. -2011-12-22 Juergen E. Fischer +Borys Jurgiel 2013-06-26 - * src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h: gdal provider: add - statusChanged signal and fix debugging output + [Plugin Manager] better formatting of plugin details -2011-12-22 Richard Duivenvoorde +Borys Jurgiel 2013-06-26 - * src/app/qgisapp.cpp, src/gui/qgsprojectionselector.cpp, - src/ui/qgsprojectionselectorbase.ui: apply pull #64: - make proj4 string area resizable - this overriding the cursor messes up the cursor in the Qsplitter - etc. - 4 recent crs's is a little low... make it 8 - fixing the selecting of the non-current crs when dialog shows + [Plugin Installer] Fix #8080 -2011-12-22 Juergen E. Fischer +Borys Jurgiel 2013-06-25 - * i18n/qgis_de.ts: german translation update + follow up 86bebab3ce -2011-12-22 Juergen E. Fischer +Borys Jurgiel 2013-06-25 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - remove ctid limitation to 32bit + [Plugin Installer] Fix metadata description, add "about" tag, prefer remote plugin name. -2011-12-22 Alexander Bruy +Borys Jurgiel 2013-06-25 - * src/app/CMakeLists.txt, - src/app/spatialite/qgsnewspatialitelayerdialog.cpp, - src/app/spatialite/qgsnewspatialitelayerdialog.h, - src/app/spatialite/qgsspatialitesridsdialog.cpp, - src/app/spatialite/qgsspatialitesridsdialog.h, - src/ui/qgsnewspatialitelayerdialogbase.ui: [BACKPORT] use native - projection selector in New SpatiaLite layer dialog (completely fix - #4549) + follow up 86bebab3ce -2011-12-22 Juergen E. Fischer +Borys Jurgiel 2013-06-25 - * src/app/qgsrasterlayerproperties.cpp: fix #4647 (introduced in - 3b9b2d - track backports please) + [Plugin Installer] Fix #8111. Better repository error handling. -2011-12-22 Alexander Bruy +Borys Jurgiel 2013-06-25 - * python/plugins/fTools/resources.qrc: new gis theme icon for Merge - shapefiles tool. Thanks to Robert + [Plugin Installer] Simplify plugin reloading -2011-12-22 Marco Hugentobler +Borys Jurgiel 2013-06-25 - * src/gui/attributetable/qgsattributetablemodel.cpp: [backport]: fix - for attribute shift in form when invoked from table + Follow up 24bbd485a -2011-12-21 Marco Hugentobler +Borys Jurgiel 2013-06-25 - * src/core/qgsvectorfilewriter.cpp: [backport] Skip attribute values - with invalid variant type (fixes ticket #4684) + [Plugin Manager] Display proper plugin count -2011-12-21 Alexander Bruy +Borys Jurgiel 2013-06-25 - * src/providers/ogr/qgsogrprovider.cpp: [BACKPORT] fix Query builder - from layer properties when layer name in cyrrilic (fix #2435) + [Plugin Installer] Follow up 4ecf3ebd0 (use QgsNetworkManager in plugin installer) -2011-12-21 Radim Blazek +Juergen E. Fischer 2013-06-25 - * src/app/qgsrasterlayerproperties.cpp, - src/providers/grass/qgis.d.rast.c, - src/providers/grass/qgsgrassrasterprovider.cpp: No data values fix. - Very small numbers were used instead of very big numbers for FCELL - and DCELL - 0 values were rendered as null. Better looking values - used because are shown in GUI + fix #8159 -2011-12-21 Juergen E. Fischer +Juergen E. Fischer 2013-06-25 - * i18n/qgis_de.ts: german translation update + german translation update -2011-12-20 Radim Blazek +Juergen E. Fischer 2013-06-25 - * src/app/qgsrasterlayerproperties.cpp: reload default color table + followup 55135d600 -2011-12-20 Gary Sherman +D'Hont René-Luc 2013-06-25 - * : Merge pull request #75 from g-sherman/master Added tip about plugins + [QGIS-Server] WFS Filter : send empty data instead of XML error when no feature found + + Bug #8123 + When a getFeature request has a FILTER parameter, and when no data + corresponds, QGIS answer sometimes with : + i + No feature found error messages: . + + It would be better to send back an empty GML (Or GeoJSON) instead. -2011-12-20 Alexander Bruy +rmgu 2013-06-25 - * python/plugins/GdalTools/__init__.py, - python/plugins/fTools/__init__.py, - python/plugins/mapserver_export/__init__.py, - python/plugins/osm/__init__.py, - python/plugins/plugin_installer/__init__.py, - src/app/qgspluginitem.cpp, src/app/qgspluginitem.h, - src/app/qgspluginmanager.cpp, src/app/qgspluginregistry.cpp, - src/gui/qgsdetaileditemdata.cpp, src/gui/qgsdetaileditemdata.h, - src/gui/qgsdetaileditemdelegate.cpp, - src/gui/qgsdetaileditemdelegate.h, - src/gui/qgsdetaileditemwidget.cpp, - src/plugins/coordinate_capture/coordinatecapture.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugin.cpp, - src/plugins/delimited_text/qgsdelimitedtextplugin.h, - src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp, - src/plugins/dxf2shp_converter/dxf2shpconverter.cpp, - src/plugins/evis/evis.cpp, - src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/globe/globe_plugin.cpp, - src/plugins/gps_importer/qgsgpsplugin.cpp, - src/plugins/grass/qgsgrassplugin.cpp, - src/plugins/grass/qgsgrassplugin.h, - src/plugins/interpolation/qgsinterpolationplugin.cpp, - src/plugins/offline_editing/offline_editing_plugin.cpp, - src/plugins/oracle_raster/qgsoracle_plugin.cpp, - src/plugins/plugin_builder.py, - src/plugins/plugin_template/plugin.cpp, src/plugins/qgisplugin.h, - src/plugins/qgsrendererplugin.h, - src/plugins/qgsvectoroverlayplugin.h, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp, src/plugins/roadgraph/roadgraphplugin.cpp, - src/plugins/spatialquery/qgsspatialqueryplugin.cpp, - src/plugins/spit/qgsspitplugin.cpp, - src/plugins/spit/qgsspitplugin.h, - src/plugins/sqlanywhere/sqlanywhere.cpp, - src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp, - src/ui/qgsdetaileditemwidgetbase.ui: introduced new plugin metadata - entry "category". Show hint based on category in Plugin Manager and - update all core plugins respectively + Save GRASS r.report output in HTML -2011-12-20 Alexander Bruy +D'Hont René-Luc 2013-06-25 - * src/plugins/evis/evis.cpp, - src/plugins/roadgraph/roadgraphplugin.cpp: move RoadGraph plugin to - Vector menu and eVis to Database as suggested by Paolo + [QGIS-Server] The parameter PROPERTYNAME does not filter attributes + + Bug #8155 + In the OGC standard, the parameter PROPERTYNAME is ussed to filter attributes in the request getFeature. In version 1.8 this parameter works. Because of changes in the vector API, this parameter does not filter attribute. -2011-12-20 Alexander Bruy +Werner Macho 2013-06-25 - * src/plugins/offline_editing/offline_editing_plugin.cpp, - src/plugins/spit/qgsspitplugin.cpp: move database plugins buttons to - the Database toolbar + translation update: fi by Kari -2011-12-20 Alexander Bruy +Matthias Kuhn 2013-06-23 - * python/gui/qgisinterface.sip, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgisappinterface.cpp, - src/app/qgisappinterface.h, src/gui/qgisinterface.h, - src/ui/qgisapp.ui: added Database toolbar in addition to the - Database menu + QgsVectorLayerFeatureIterator: Don't worry about concurrent edits + An iterator will always use the data from the edit buffer which was + valid, at the time the iterator was created. Therefore, there are no + more problems with randomly disappearing or changing features while + iterating -2011-12-20 Alexander Bruy +Matthias Kuhn 2013-06-23 - * python/plugins/fTools/fTools.py: quick temporary fix for fTools to - work with new Vector menu + const-correctness for QgsGeometry -2011-12-20 Alexander Bruy +Hugo Mercier 2013-06-25 - * src/plugins/delimited_text/qgsdelimitedtextplugin.cpp, - src/plugins/dxf2shp_converter/dxf2shpconverter.cpp, - src/plugins/gps_importer/qgsgpsplugin.cpp, - src/plugins/spatialquery/qgsspatialqueryplugin.cpp: move some - plugins under Vector menu and toolbar + Add an update of overview on centering mode switch -2011-12-20 Alexander Bruy +Werner Macho 2013-06-25 - * python/gui/qgisinterface.sip, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgisappinterface.cpp, - src/app/qgisappinterface.h, src/gui/qgisinterface.h, - src/ui/qgisapp.ui: add Vector menu and toolbar to improve plugins - organization + translation update id by Trias -2011-12-20 Alexander Bruy +Werner Macho 2013-06-24 - * src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/interpolation/qgsinterpolationplugin.cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp, src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp: move - all raster related plugins to the Raster menu (adresses #4395) + Fixing some Tooltips regarding to #8147 -2011-12-20 Alexander Bruy +Merge: f1e2fce dab1e3c +Werner Macho 2013-06-24 - * python/gui/qgisinterface.sip, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgisappinterface.cpp, - src/app/qgisappinterface.h, src/gui/qgisinterface.h: implement - helper methods to add plugins to the Raster menu and toolbar + Merge pull request #675 from artfwo/master + + Russian translation update (half-way) -2011-12-20 Juergen E. Fischer +Juergen E. Fischer 2013-06-24 - * : readd google mercartor (pseudo epsg:900913) removed with with - 42e02d82c05b4da370be77ef71345ba62457cc66 (IssueID #4652) + more interface fixes (missing GUI_EXPORT and sip) -2011-12-20 Juergen E. Fischer +Artem Popov 2013-06-24 - * src/providers/postgres/qgspostgresprovider.cpp: apply #4685 + Russian translation update. -2011-12-19 Marco Hugentobler +Juergen E. Fischer 2013-06-24 - * src/app/composer/qgscomposermapwidget.cpp, - src/app/composer/qgscomposermapwidget.h, - src/ui/qgscomposermapwidgetbase.ui: More precise composer map - rotation (ticket #4632) + KeyboardControlHandler: remove unused parameter -2011-12-19 Radim Blazek +Juergen E. Fischer 2013-06-24 - * src/core/raster/qgsrasterlayer.cpp: use double instead of float - for min/max values, fixes #4315 + fix sip build errors -2011-12-19 Alexander Bruy +Salvatore Larosa 2013-06-23 - * src/app/qgisapp.cpp, src/app/qgisapp.h: [FEATURE] use combobox to - display scale. Also add predefined values for quick scale select + [fTools] fixes zoom to error in check geometry validity tool -2011-12-18 Radim Blazek +Juergen E. Fischer 2013-06-23 - * src/core/raster/qgsrasterlayer.cpp: set min/max values if - available for single band, set StretchToMinimumMaximum if min/max - are available for grayscale, fixes part of #4193 - GRASS rasters are - drawn in gray + fix build error -2011-12-18 Radim Blazek +Juergen E. Fischer 2013-06-23 - * src/core/qgsrasterdataprovider.cpp: set raster stats bandName and - bandNumber, fixes one problem of #4193 - band name can only be set - to "" or "Not set". + use QgsNetworkManager in plugin installer (fixes #8137) -2011-12-18 Marco Hugentobler +Juergen E. Fischer 2013-06-23 - * src/ui/qgslabelingguibase.ui: Enable button to access label engine - settings + german translation update -2011-12-18 Juergen E. Fischer +Juergen E. Fischer 2013-06-23 - * src/app/attributetable/qgsattributetabledialog.cpp: fix #4389 + spelling fixes -2011-12-18 Juergen E. Fischer +Juergen E. Fischer 2013-06-23 - * src/core/raster/qgsrasterlayer.cpp: add log messages to raster - layer + sip update -2011-12-18 Juergen E. Fischer +Matthias Kuhn 2013-06-23 - * doc/changelog.t2t, src/app/qgsrasterlayerproperties.cpp, - src/app/qgsrasterlayerproperties.h, src/core/qgsmaprenderer.cpp, - src/gui/qgsexpressionbuilderwidget.cpp: fix typos + [memory provider] Don't crash on updateExtent and feature without geometry -2011-12-18 Marco BErnasocchi +Matthias Kuhn 2013-06-23 - * src/ui/qgsnewspatialitelayerdialogbase.ui: added QScrollarea to - new spatialite dialog + update extent on delete feature and updategeometry -2011-12-17 Alexander Bruy +Juergen E. Fischer 2013-06-23 - * python/plugins/fTools/tools/doMergeShapes.py: [BACPORT] fix Merge - shapefile to one crash when used layers mode + fix build error -2011-12-17 Alexander Bruy +Giuseppe Sucameli 2013-06-23 - * src/ui/qgsnewspatialitelayerdialogbase.ui: minor UI fix in New - SpatiaLite Layer dialog + DBManager: more SIP API update (fix #8132) -2011-12-16 Juergen E. Fischer +Juergen E. Fischer 2013-06-22 - * : remove "unsynced" EPSG CRS that are not listed in GDAL (closes - #4652) + missed query builder help in c6a4bb86aa -2011-12-16 Alexander Bruy +Juergen E. Fischer 2013-06-22 - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/resources.qrc: new icons for RGB to PCT and - PCT to RGB tools from Robert + - add missing sip bindings + - port widgets_tree.py to QtXml and update customization.xml (fixes #5752 and #8054) -2011-12-16 Marco Hugentobler +Borys Jurgiel 2013-06-22 - * python/core/qgsmaplayer.sip: Added title / abstract to python - bindings + [Plugin Manager] If no Python support detected, display an explanation why there is nothing to install. Fixes #8063. PL translation included. -2011-12-16 Marco Hugentobler +Merge: ff27ee8 e21ce1b +Werner Macho 2013-06-22 - * : commit dcae36009e56843561f68021ca554249b9fd8bbf Author: Marco - Hugentobler Date: Fri Dec 16 - 11:31:52 2011 +0100 + Merge pull request #672 from qgis-jp/make_pull_req_from_ja + + update Translation GUI ja -2011-12-16 Alexander Bruy +yoichigmf 2013-06-22 - * src/plugins/gps_importer/qgsgpsplugin.cpp: [BACKPORT] add - extension to new GPX file if user ommit it (fix #4623) + update Translation GUI ja -2011-12-15 Marco Hugentobler +Matthias Kuhn 2013-06-22 - * src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsconfigparser.h, src/mapserver/qgsprojectparser.cpp: - Publish layer titles and abstracts in WMS capabilities + [spatialite] Fix compile error -2011-12-15 Marco Hugentobler +Matthias Kuhn 2013-06-22 - * src/app/qgsrasterlayerproperties.cpp, - src/app/qgsvectorlayerproperties.cpp, src/core/qgsmaplayer.cpp, - src/core/qgsmaplayer.h, src/ui/qgsrasterlayerpropertiesbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui: [FEATURE]: layer can have - abstracts and title (e.g. for the use in WMS server) + [spatialite] Implement rewind() -2011-12-15 Marco Hugentobler +Juergen E. Fischer 2013-06-22 - * src/providers/wfs/qgswfssourceselect.cpp: Fix column mismatch in - wfs dialog + fix #8099: useful error message on table_info -2011-12-15 Alexander Bruy +Juergen E. Fischer 2013-06-22 - * src/app/qgisapp.cpp: use project title as default filename in Save - and Save as dialogs (implements #4326) + fix #8131 -2011-12-15 Werner Macho +Merge: aa0a17b 8c92ac9 +Werner Macho 2013-06-22 - * i18n/qgis_et.ts: translation update: et by veiko + Merge pull request #671 from qgis-jp/make_pull_req_from_ja + + update GUI translation ja -2011-12-14 Alexander Bruy +Merge: f8d6e32 bed65cb +mhugent 2013-06-22 - * python/plugins/fTools/tools/ftools_utils.py: [BACKPORT] sort - layers and fields alphabetically in fTools (fix #4412) + Merge pull request #670 from tqhien/master + + Fix #7927 : Add a warning message if trying to print a composition -2011-11-14 pcav +Minoru Akagi 2013-05-08 - * i18n/qgis_it.ts: Minor fix to IT GUI + Georeferencer: a fix to support non-ASCII path -2011-12-13 Juergen E. Fischer +yoichigmf 2013-06-22 - * src/core/qgsexpression.h, src/mapserver/qgshttprequesthandler.cpp: - fix windows build + update GUI translation ja -2011-12-13 Marco Hugentobler +Hien TRAN-QUANG 2013-06-22 - * src/ui/qgswfssourceselectbase.ui: typo + Fix #7927 : Add a warning message if trying to print a composition + as an image fails (Qt's QImage sanity check for memory overflow) + Moved previous commit from core/qgscomposition to apps/qgscomposer + as QGIS server uses qgscomposition. -2011-12-13 Marco Hugentobler +Juergen E. Fischer 2013-06-22 - * src/app/qgisapp.cpp, src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfssourceselect.cpp, - src/ui/qgswfssourceselectbase.ui: [FEATURE]: choice to keep WFS - layers in cache or load the data on redraw + german translation update -2011-12-13 Alexander Bruy +Juergen E. Fischer 2013-06-21 - * src/gui/qgsattributeeditor.cpp: [BACKPORT] use native separators - in filename edit widget (fix #2992) + context_help/function_help: + - remove en_US postfix + - remove translated files (translation were moved to ts files earlier) + - remove unused jQuery (python help doesn't use it anymore) + - change expression label in QgsQueryBuilder and add context help (partly fixes + #8129) -2011-12-13 Sergey Yakushev +Juergen E. Fischer 2013-06-21 - * : Merge remote branch 'pb/master' + vector providers: allow multiple iterators - testing required -2011-12-13 Marco Hugentobler +Merge: 9bbc647 6876540 +Nathan Woodrow 2013-06-22 - * : commit 700e6b42e62bfa25101179ee6d136cac0bcc0f1f Author: Marco - Hugentobler Date: Mon Dec 12 - 17:01:17 2011 +0100 + Merge branch 'iterator' + + Semi fix #7472. + Semi fix #7862 -2011-12-11 Werner Macho +Nathan Woodrow 2013-06-21 - * : Merge pull request #72 from Jean-Roc/master update fr strings + Close active iterators -2011-12-10 Juergen E. Fischer +Nathan Woodrow 2013-06-20 - * src/analysis/network/qgsgraphanalyzer.cpp, - src/analysis/network/qgsgraphbuilderintr.h, src/app/qgsoptions.cpp, - src/core/symbology-ng/qgssvgcache.h, - src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp, - src/plugins/roadgraph/shortestpathwidget.cpp, - src/providers/delimitedtext/qgsdelimitedtextprovider.cpp, - src/providers/delimitedtext/qgsdelimitedtextprovider.h, - src/providers/wms/qgswmsprovider.cpp: fix source permissions + Set filter on iterator: -2011-12-10 Juergen E. Fischer +Nathan Woodrow 2013-06-20 - * src/providers/wms/qgswmssourceselect.cpp: enable wait cursor when - wms search is ongoing (closes #4625) + Remove driver -2011-12-10 Alexander Bruy +Nathan Woodrow 2013-06-19 - * ms-windows/QGIS-Installer.nsi: don't keep shortcuts after - uninstalling standalone version (fix #2977) + Use a new ogr layer per iterator -2011-12-10 Alexander Bruy +Juergen E. Fischer 2013-06-20 - * python/plugins/fTools/tools/doVectorSplit.py: remove debug output - from fTools (again) + identation update and fix clang 3.3 warnings -2011-12-10 Radim Blazek +Matthias Kuhn 2013-06-20 - * src/app/qgsrasterlayerproperties.cpp: #3723 fix, sync transparency - table with raster + [dbmanager] Fix python error -2011-12-10 Alexander Bruy +Juergen E. Fischer 2013-06-20 - * src/app/qgisapp.cpp: [BACKPORT] mark project dirty when added or - removed composer (fix #3577) + fix crash in plugin installer -2011-12-10 Radim Blazek +Marco Hugentobler 2013-06-20 - * : commit e154f692c47594c4debfef1ed0d46dc1b5c14ee4 Author: Radim - Blazek Date: Sat Dec 10 10:07:07 2011 - +0100 + Fix WFS layer items in browser -2011-12-10 Werner Macho +Borys Jurgiel 2013-06-20 - * : Merge pull request #71 from Cracert/master translation update: pl + [Plugin Manager] Follow up commit:b16cc46 -2011-12-09 Robert Szczepanek +Borys Jurgiel 2013-06-20 - * i18n/qgis_pl_PL.ts: translation update: pl by Milena + [Plugin Manager] Fixes #8122: Scroll bar in new plugin manager doesn't work properly -2011-12-09 Giuseppe Sucameli +Matthias Kuhn 2013-06-20 - * python/plugins/GdalTools/__init__.py, - python/plugins/GdalTools/tools/GdalTools_utils.py, - python/plugins/GdalTools/tools/dialogBase.py, - python/plugins/GdalTools/tools/dialogSettings.ui, - python/plugins/GdalTools/tools/doSettings.py: [BACKPORT] Enable path - to pymods in GdalTools settings dialog and automatically set default - OSX environment (fix #3170) + [ftools,gdaltools] Errors in Merge Shapefiles and Split vector layer + * Fix #8120 + * Fix #8119 -2011-12-09 Marco Hugentobler +Merge: e4b278d f7c556f +Werner Macho 2013-06-19 - * src/app/qgisapp.cpp, src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h: Enable wfs extent option - again + Merge pull request #669 from qgis-jp/make_pull_req_from_ja + + update GUI translation ja -2011-12-09 Alexander Bruy +yoichigmf 2013-06-20 - * python/plugins/fTools/tools/doGeoprocessing.py: remove some debug - output from fTools + update GUI translation ja -2011-12-09 Marco Hugentobler +Juergen E. Fischer 2013-06-19 - * src/core/qgsexpression.cpp, src/core/qgsexpression.h, - src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsconnection.h: Support writing filters by - hand, remove namespace from filter element, better comments + add QgsFontUtils sip bindings and fix doxygen warnings -2011-12-09 Tim Sutton +Juergen E. Fischer 2013-06-19 - * : commit 6fbad32b6bae6feb8e87b5ca63a6d0f16287eb9c Author: Tim - Sutton Date: Fri Dec 9 14:48:08 2011 +0200 + german translation update -2011-12-09 Marco Hugentobler +Juergen E. Fischer 2013-06-19 - * src/mapserver/qgswmsserver.cpp: qgis server: allow empty strings - in filters + - move ui defaults to ui_defaults.h + - add scripts/mkuidefaults.py to create ui_defaults.h from current + setting + - default ui state with two toolbar rows (fixes #8117) + - update plugin registry state of nsis installer -2011-12-09 Alexander Bruy +Merge: 86695a9 8fd200e +Werner Macho 2013-06-19 - * src/app/qgisapp.cpp, - src/plugins/offline_editing/offline_editing_plugin.cpp, - src/plugins/oracle_raster/qgsoracle_plugin.cpp, - src/plugins/oracle_raster/qgsoracle_plugin.h, - src/plugins/spit/qgsspitplugin.cpp: [BACKPORT] move database related - plugins to Database menu and create some icons in Layers toolbar - (partial fix for #4395) + Merge pull request #668 from asiersarasua/master + + Basque translation update -2011-12-08 Juergen E. Fischer +asiersarasua 2013-06-19 - * src/mapserver/qgis_map_serv.cpp, - src/mapserver/qgsgetrequesthandler.cpp, - src/mapserver/qgsmslayercache.cpp, - src/mapserver/qgsremoteowsbuilder.cpp, - src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: WMS - server: add more capabilities to GetCapabilities response (including - GetPrint) Thanks Marco Lechner for the initial patch. + Basque translation update -2011-12-07 Juergen E. Fischer +Werner Macho 2013-06-19 - * src/mapserver/qgis_map_serv.cpp, - src/mapserver/qgscapabilitiescache.cpp, - src/mapserver/qgscapabilitiescache.h, - src/mapserver/qgsconfigcache.cpp, - src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h, - src/mapserver/qgsfilter.cpp, - src/mapserver/qgsgetrequesthandler.cpp, - src/mapserver/qgsgetrequesthandler.h, - src/mapserver/qgshttprequesthandler.cpp, - src/mapserver/qgshttprequesthandler.h, - src/mapserver/qgsmslayerbuilder.cpp, - src/mapserver/qgsmslayercache.cpp, - src/mapserver/qgspostrequesthandler.cpp, - src/mapserver/qgspostrequesthandler.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsremoteowsbuilder.cpp, - src/mapserver/qgsremoteowsbuilder.h, - src/mapserver/qgsrequesthandler.h, src/mapserver/qgssldparser.h, - src/mapserver/qgssoaprequesthandler.cpp, - src/mapserver/qgssoaprequesthandler.h, - src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: - [FEATURE] WMS server: add support for WMS 1.1.1 and port to QMap - (from std::map) Thanks Marco Lechner for the initial WMS 1.1.1 - patch. + small changes to topology checker GUI -2011-12-08 Marco Hugentobler +Matthias Kuhn 2013-06-19 - * src/mapserver/qgswmsserver.cpp: WMS server: let fuzzy string - functions go through filter safety test + [gdaltools] Proximity(raster distance) error (Fix #8115) -2011-12-08 Marco Hugentobler +Matthias Kuhn 2013-06-19 - * src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h: More - descriptive parameter name and comment + [gdaltools] DEM(Terrain Models) tool error (Fix #8116) -2011-12-01 Marco Hugentobler +Matthias Kuhn 2013-06-19 - * src/core/composer/qgscomposermap.cpp, - src/core/composer/qgscomposermap.h, src/core/qgsmaprenderer.cpp, - src/core/qgsmaprenderer.h: Show marker sizes and line widths in - composer in proportion to the page + Merge feature attributes: Return NULL if unable to calculate -2011-12-08 Marco Hugentobler +Matthias Kuhn 2013-06-19 - * src/core/qgsexpression.cpp, src/core/qgsexpression.h, - src/ui/qgswfssourceselectbase.ui: Filter export for operators AND / - OR + "Merge selected features" leads to data loss (Fix #6902) -2011-12-07 marco +Merge: 419d8ee 5bcb0e1 +Werner Macho 2013-06-19 - * : commit b72f086409ecc872664e0bc389caa0e140fd3e2f Author: Marco - Hugentobler Date: Wed Dec 7 - 16:01:48 2011 +0100 + Merge pull request #667 from yjacolin/gdalToolsdoPolygonBug + + Update doPolygonize.py -2011-12-07 Werner Macho +Jacolin 2013-06-19 - * i18n/qgis_et.ts: translation update: string updates Estonian + Update doPolygonize.py + + add missing '('. -2011-12-07 Marco Hugentobler +Matthias Kuhn 2013-06-19 - * src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsconnection.h, - src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfsprovider.h, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h, - src/ui/qgswfssourceselectbase.ui: Read available provider fields for - expression dialog from wfs DescribeFeatureInfo + [ftools] Fix basic statistics (Fix #8105) -2011-12-07 Werner Macho +Matthias Kuhn 2013-06-19 - * i18n/qgis_et.ts: translation update: et by Veiko + [ftools] Fix Line Intersection (Fix #8114) -2011-12-07 marco +Matthias Kuhn 2013-06-19 - * python/core/qgscomposition.sip, - src/core/composer/qgscomposition.cpp, - src/core/composer/qgscomposition.h, src/gui/qgscomposerview.cpp: - Option to create undo commands whan adding composer items from xml + Fix wrong python None type reference counting -2011-12-07 marco +Hugo Mercier 2013-06-19 - * python/core/qgscomposition.sip, python/gui/qgscomposerview.sip, - src/core/composer/qgscomposition.cpp, - src/core/composer/qgscomposition.h, src/gui/qgscomposerview.cpp, - src/gui/qgscomposerview.h: Move more item related functions from - composerview to composeritem + Fix overview autocentering: always center, not only when the overview is not visible. + + Work funded by Tuscany Region - SITA. Contract "Support to the use + of GFOSS (Geographic Free and Open Source Software) Desktop tools" + (CIG Z3B06FA6D7). -2011-12-07 Juergen E. Fischer +Werner Macho 2013-06-19 - * i18n/qgis_de.ts: german translation update + translation update: es by Carlos -2011-11-30 Juergen E. Fischer +Matthias Kuhn 2013-06-19 - * src/app/qgisapp.cpp: hide layer order dock by default + [vectorlayer] Update map extent when feature added / geom changed -2011-11-30 Juergen E. Fischer +Matthias Kuhn 2013-06-19 - * src/core/qgsdbtablemodel.cpp: add tooltip for 'Select At Id' - option in postgres selection dialog + [ftools] Fix distance matrix (Fix #8103) -2011-12-06 Juergen E. Fischer +Matthias Kuhn 2013-06-19 - * src/app/main.cpp: reindent main.cpp + [ftools] Several fixes + Fix #8107 Mean coordinates + Fix #8105 Basic statistics + Fix #8104 Unique values -2011-12-06 Juergen E. Fischer +Borys Jurgiel 2013-06-18 - * src/app/ogr/qgsvectorlayersaveasdialog.cpp, src/app/qgisapp.cpp: - implement #4615: save as spatialite + Translation update: pl -2011-12-06 Juergen E. Fischer +Chris Crook 2013-06-19 - * src/providers/wms/qgswmsprovider.cpp: wms provider: log error - message, if a faulty image is returned. + Fixing delimited text test cases for SIP API change -2011-12-06 Marco Hugentobler +Marco Hugentobler 2013-06-18 - * src/providers/wfs/qgswfssourceselect.cpp, - src/ui/qgswfssourceselectbase.ui: Possibility to add several wfs - layers in one go + Mark project dirty in case of composer changes -2011-12-06 Alexander Bruy +Werner Macho 2013-06-18 - * src/app/main.cpp: fix build + Adjusting Tip once more and fixing a bug with http link -2011-12-06 Werner Macho +Borys Jurgiel 2013-06-18 - * i18n/qgis_de.ts: translation update: small typo fix + [Plugin Installer] Fix urls excluded from proxy (#8092) -2011-12-06 Tim Sutton +Werner Macho 2013-06-18 - * src/mapserver/qgis_map_serv.cpp, - src/mapserver/qgshttprequesthandler.cpp, - src/mapserver/qgswmsserver.cpp: Added more debugging info to wms - server. Also when compiled in debug mode, it will write the last - rendered image out to the system temp dir (overwriting it with each - render) + Changing tip according to the new Plugins Manager, thanks to Richard for pointing this out -2011-12-06 Tim Sutton +Chris Crook 2013-06-18 - * : commit a5f15d88b19aededbfe11fd682eeb9145e610aa9 Author: marco - Date: Mon Dec 5 22:30:17 2011 +0100 + Added SIP version test to delimited text test script -2011-12-05 marco +Werner Macho 2013-06-18 - * python/gui/qgscomposerview.sip, src/app/composer/qgscomposer.cpp, - src/gui/qgscomposerview.cpp, src/gui/qgscomposerview.h: Remove - addItem methods of composer view. Use the ones from composition - instead + translation update sv by Victor -2011-12-05 Werner Macho +Merge: bdd61d5 5f17250 +vinayan 2013-06-17 - * i18n/qgis_pt_PT.ts: translation update: pt_PT by Luís de Sousa + Merge pull request #664 from vinayan/topofix + + [Fix #8095] - fix topology error markers -2011-12-05 marco +vinayan 2013-06-18 - * src/app/composer/qgscomposer.cpp: Keep item option tab up-to-date + fix topology error markers -2011-12-05 Marco Hugentobler +Hugo Mercier 2013-06-17 - * src/core/qgsproject.cpp: Fix crash with relative file paths if - projPath is not yet defined + Add SIP and Python unit test for overview autocentering. + + Work funded by Tuscany Region - SITA. Contract "Support to the use + of GFOSS (Geographic Free and Open Source Software) Desktop tools" + (CIG Z3B06FA6D7). -2011-12-05 Alexander Bruy +Hugo Mercier 2013-06-17 - * python/plugins/fTools/tools/doMergeShapes.py, - python/plugins/fTools/tools/doSimplify.py, - python/plugins/fTools/tools/doSpatialIndex.py: [BACKPORT] don't - change cursor to hourglass for fTools that runs in separate thread + Add unit test for autocentering of overview + + Work funded by Tuscany Region - SITA. Contract "Support to the use + of GFOSS (Geographic Free and Open Source Software) Desktop tools" + (CIG Z3B06FA6D7). -2011-12-05 Alexander Bruy +Hugo Mercier 2013-06-17 - * python/plugins/fTools/fTools.py, - python/plugins/fTools/tools/doVectorSplit.py: [BACKPORT] run Split - vector layer tool in separate thread to prevent UI blocking + Add autocentering of overview + + Work funded by Tuscany Region - SITA. Contract "Support to the use + of GFOSS (Geographic Free and Open Source Software) Desktop tools" + (CIG Z3B06FA6D7). -2011-12-04 Tim Sutton +Matthias Kuhn 2013-06-17 - * : Merge pull request #68 from mbernasocchi/android [BP18] Android adaptations + Only cleanup python on exit if loaded + Fix #8085 -2011-12-04 Werner Macho +Matthias Kuhn 2013-06-17 - * i18n/qgis_mn.ts: translation update: mn by Bayarmaa + [gdaltools] SIP API update -2011-12-04 Werner Macho +Matthias Kuhn 2013-06-17 - * : Merge pull request #70 from Jean-Roc/master update fr translation + [gdaltools] More SIP API updates -2011-12-03 Juergen E. Fischer +Matthias Kuhn 2013-06-17 - * src/app/legend/qgslayerorder.cpp, src/app/legend/qgslegend.cpp, - src/app/legend/qgslegend.h: fix #4600: also remove invisible layers - from layer order list + [gdaltools] More SIP API update -2011-12-03 Marco BErnasocchi +Salvatore Larosa 2013-06-17 - * .gitignore: - added CmakeLists.txt.user to .gitignore + Fixes #8061 -2011-12-03 Marco BErnasocchi +Salvatore Larosa 2013-06-14 - * src/app/CMakeLists.txt, src/app/main.cpp: - Fixed pull request comments + [pyqgis-console] small update to help -2011-12-02 Alexander Bruy +Juergen E. Fischer 2013-06-16 - * src/gui/qgsnewvectorlayerdialog.cpp: [BACKPORT] New vector layer - dialog - show CRS as authid-description pair instead of proj4 string + german translation update -2011-12-02 Alexander Bruy +Werner Macho 2013-06-16 - * src/ui/qgsnewvectorlayerdialogbase.ui: [BACKORT] move Add - attribute button in New vector layer dialog (fix #2749) and some - other minor UI fixes + pre translation update 10 days to String Freeze -2011-12-02 Tim Sutton +Juergen E. Fischer 2013-06-16 - * : commit 335dbf16313e42bd80f84c05f497fc8ac85e1ae0 Merge: 7c128e1 - c63b149 Author: Tim Sutton Date: Thu Dec 1 - 21:56:16 2011 -0800 + fix #8082 -2011-12-02 Nathan Woodrow +Juergen E. Fischer 2013-06-16 - * python/console.py, src/app/legend/qgslayerorder.cpp, - src/app/qgisapp.cpp: Reduce layout margins on legend, legend order, - python console. Change legend order font size to 10 same as legend + fix #8083 (MultiSurfaces not supported) -2011-11-29 Alexander Bruy +Merge: e8f7c13 9b242c2 +Werner Macho 2013-06-16 - * src/ui/qgsvectorlayerpropertiesbase.ui: minor UI fix in vector - layer properties dialog + Merge pull request #663 from Jean-Roc/mywork + + update fr ui -2011-12-01 Giuseppe Sucameli +Merge: 449c2a2 2c33403 +vinayan 2013-06-16 - * python/plugins/GdalTools/resources.qrc, - python/plugins/GdalTools/tools/dialogSettings.ui, - python/plugins/GdalTools/tools/doSettings.py: add helpful info to - GdalTools Settings dialog on how to configure GDAL path + Merge pull request #634 from vinayan/offlineFixWin + + Offline Editing Plugin - Windows Fix -2011-12-01 Giuseppe Sucameli +Matthias Kuhn 2013-06-16 - * python/plugins/GdalTools/tools/GdalTools_utils.py, - python/plugins/GdalTools/tools/dialogBase.py: [BACKPORT] find python - on OSX (partially fix #3097) don't overwrite PATH env var, but - append to it. + Include joined fields when merging QgsFields -2011-11-30 Marco Bernasocchi +Matthias Kuhn 2013-06-16 - * src/app/qgisapp.cpp: fix #4573 + [attrtable] Fix button checked state + The wrong button was checked, when the view mode was not changed with a button click but another event. -2011-11-30 Tim Sutton +Matthias Kuhn 2013-06-16 - * CMakeLists.txt, cmake_templates/qgsconfig.h.in, doc/qgisdoc.css, - resources/CMakeLists.txt, resources/css/CMakeLists.txt, - resources/css/ie.css, resources/css/print.css, - resources/css/qgisdoc.css, resources/css/screen.css, - resources/html/CMakeLists.txt, resources/html/chart.html, - resources/html/qgsrasterlayer.html, resources/js/API.txt, - resources/js/CMakeLists.txt, resources/js/FAQ.txt, - resources/js/LICENSE.txt, resources/js/NEWS.txt, - resources/js/PLUGINS.txt, resources/js/README.txt, - resources/js/excanvas.js, resources/js/excanvas.min.js, - resources/js/jquery.colorhelpers.js, - resources/js/jquery.colorhelpers.min.js, - resources/js/jquery.flot.crosshair.js, - resources/js/jquery.flot.crosshair.min.js, - resources/js/jquery.flot.fillbetween.js, - resources/js/jquery.flot.fillbetween.min.js, - resources/js/jquery.flot.grow.js, - resources/js/jquery.flot.image.js, - resources/js/jquery.flot.image.min.js, resources/js/jquery.flot.js, - resources/js/jquery.flot.min.js, - resources/js/jquery.flot.navigate.js, - resources/js/jquery.flot.navigate.min.js, - resources/js/jquery.flot.pie.js, - resources/js/jquery.flot.pie.min.js, - resources/js/jquery.flot.resize.js, - resources/js/jquery.flot.resize.min.js, - resources/js/jquery.flot.selection.js, - resources/js/jquery.flot.selection.min.js, - resources/js/jquery.flot.stack.js, - resources/js/jquery.flot.stack.min.js, - resources/js/jquery.flot.symbol.js, - resources/js/jquery.flot.symbol.min.js, - resources/js/jquery.flot.threshold.js, - resources/js/jquery.flot.threshold.min.js, resources/js/jquery.js, - resources/js/jquery.min.js, resources/js/json.js, - src/app/CMakeLists.txt, src/app/main.cpp, - src/app/qgsrasterlayerproperties.cpp, - src/app/qgsrasterlayerproperties.h, src/core/qgsapplication.cpp, - src/core/qgsapplication.h, src/core/qgsmaplayer.h, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/core/qgsrasterdataprovider.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/mapserver/qgis_map_serv.cpp, src/providers/CMakeLists.txt, - src/providers/delimitedtext/CMakeLists.txt, - src/providers/gdal/CMakeLists.txt, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gpx/CMakeLists.txt, - src/providers/grass/CMakeLists.txt, - src/providers/memory/CMakeLists.txt, - src/providers/ogr/CMakeLists.txt, src/providers/osm/CMakeLists.txt, - src/providers/postgres/CMakeLists.txt, - src/providers/spatialite/CMakeLists.txt, - src/providers/sqlanywhere/CMakeLists.txt, - src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt, - src/providers/wfs/CMakeLists.txt, src/providers/wms/CMakeLists.txt, - src/ui/qgsrasterlayerpropertiesbase.ui, tests/bench/main.cpp: Revert - "Merge branch 'master' of github.com:qgis/Quantum-GIS into - qgis-master" This reverts commit 78ce3cdc84b79dbec5d227db9ee14af6edf9af66, - reversing changes made to 2414a3abbc97483a5355c262a96c4fc353566bcb. - -2011-11-30 Tim Sutton - - * : commit 2414a3abbc97483a5355c262a96c4fc353566bcb Author: Tim - Sutton Date: Wed Nov 30 14:48:00 2011 +0200 - -2011-11-30 Tim Sutton - - * src/ui/qgsprojectpropertiesbase.ui: [UI] put wms options for - project properties into a scroll widget so dialog can be resized - vertically - -2011-11-30 Tim Sutton - - * : commit 8e4e8e147cb99c3e23d736045cf5c537d99a1c0c Author: Juergen - E. Fischer Date: Wed Nov 30 09:41:50 2011 +0100 - -2011-11-30 Martin Dobias - - * src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui: Allow changing rendering - order in rule-based renderer - -2011-11-30 Martin Dobias - - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h: Allow rules to - have children - -2011-11-30 Juergen E. Fischer - - * src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h, - src/core/qgsdbtablemodel.cpp, src/core/qgsdbtablemodel.h, - src/gui/attributetable/qgsattributetablememorymodel.cpp, - src/gui/attributetable/qgsattributetablememorymodel.h, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetablemodel.h, - src/gui/attributetable/qgsattributetableview.cpp, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: [FEATURE] allow to - disable SelectAtId capability for PostgreSQL provider to force usage - of the attribute table memory model. Apparently the memory model - was completely disfunctional before. Fixes included, but it - probably needs more testing. - -2011-11-30 Juergen E. Fischer - - * src/app/legend/qgslayerorder.cpp, src/app/legend/qgslayerorder.h, - src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h, - src/app/qgisapp.cpp: legend order: add checkboxes to control whether - the legend or the layer order controls render order + Adjust data type -2011-11-29 Marco BErnasocchi +Nathan Woodrow 2013-06-16 - * : commit 376d45b0dd9cc6494eba47429799b29b34039de3 Author: marco - Date: Mon Nov 28 09:45:25 2011 +0100 + Change build path.txt to be more unique -2011-11-29 Juergen E. Fischer +Matthias Kuhn 2013-06-16 - * src/providers/postgres/qgspostgresprovider.cpp: remove superfluous - closing parenthesis + [ftools] More SIP API updates -2011-11-29 Tim Sutton +Matthias Kuhn 2013-06-16 - * : commit ce807107c9468ce7caa26db767bb695408c27510 Author: Marco - BErnasocchi Date: Tue Nov 29 03:41:33 - 2011 +0100 + attribute editor: return NULL QVariant instead of invalid QVariant -2011-11-29 Marco BErnasocchi +Jean-Roc Morreale 2013-06-16 - * src/app/main.cpp, src/core/symbology-ng/qgsrendererv2.cpp: - cleaning up for pull request + correct a typo -2011-11-29 Marco BErnasocchi +Jean-Roc Morreale 2013-06-16 - * : commit 4b86c710e90eea9a01c77eabfec14351c73461e9 Author: marco - Date: Mon Nov 28 22:14:45 2011 +0100 + update french translation -2011-11-28 Jean-Roc Morreale +Matthias Kuhn 2013-06-16 - * i18n/qgis_fr.ts: update french gui + [Gdaltools] SIP API update (Fix #8074) -2011-11-28 marco +Matthias Kuhn 2013-06-16 - * python/core/qgscomposerscalebar.sip, - src/app/composer/qgscomposerscalebarwidget.cpp, - src/app/composer/qgscomposerscalebarwidget.h, - src/core/composer/qgscomposerscalebar.cpp, - src/core/composer/qgscomposerscalebar.h, - src/core/composer/qgsnumericscalebarstyle.cpp, - src/core/composer/qgsnumericscalebarstyle.h, - src/ui/qgscomposerscalebarwidgetbase.ui: [FEATURE]: alignment - (left/middle/right) for composer scale bar to keep bar position when - zooming + [ftools] Fix "Polygon from layer extent" (#8074) -2011-11-27 Tim Sutton +Larry Shaffer 2013-06-15 - * : Resolved merge conflicts + Save/restore window geometry for change label properties dialog -2011-11-27 Juergen E. Fischer +Larry Shaffer 2013-06-10 - * i18n/qgis_de.ts, src/core/qgsapplication.cpp: yet another german - translation update + Fix for #8003, font not written to table when using change label properties tool + + The following have been updated/added to match layer's new labeling gui: + - Comboboxes for font family and style + - Buttons for underline, strikeout, bold and italic -2011-11-27 Juergen E. Fischer +Juergen E. Fischer 2013-06-15 - * src/app/legend/qgslegend.cpp: fix initial state of layer order - list on project load + replace foo.replace( QRegExp(regexp), bar) with re.sub(regexp,bar,foo) (fixes #8066) -2011-11-27 Juergen E. Fischer +Juergen E. Fischer 2013-06-15 - * src/app/qgisapp.cpp, src/core/qgsapplication.cpp, - src/core/qgsmessagelog.cpp, src/gui/qgsmessagelogviewer.cpp: more - log messages and auto-resize cells + german translation update -2011-11-27 Tim Sutton +Juergen E. Fischer 2013-06-15 - * : commit 301d20717db7a18f7f512766f1ecb4415db8eada Merge: 545e9a4 - bae8301 Author: Tim Sutton Date: Sun Nov 27 - 20:09:23 2011 +0200 + fix translation strings (fixes #8057) -2011-11-27 Juergen E. Fischer +Merge: fb15725 3bcf890 +mhugent 2013-06-15 - * src/core/qgslogger.cpp: use the same format in logfile and on - console and use either console or logfile + Merge pull request #661 from leyan/custom_CRS + + Update CRS cache when deleting a custom CRS -2011-11-27 Nathan Woodrow +Juergen E. Fischer 2013-06-15 - * src/ui/qgsprojectionselectorbase.ui: Put 'Hide deprecated CRSs' - back to size 9 + german translation update -2011-11-23 Nathan Woodrow +Matthias Kuhn 2013-06-15 - * python/gui/qgsprojectionselector.sip, - src/core/qgsapplication.cpp, - src/gui/qgsgenericprojectionselector.cpp, - src/gui/qgsprojectionselector.cpp, src/gui/qgsprojectionselector.h, - src/ui/qgsprojectionselectorbase.ui: UI tweaks to the projection UI; - Remove old buttons and code etc + Add documentation for date format in editor widget configuration -2011-11-27 Radim Blazek +Matthias Kuhn 2013-06-15 - * tests/bench/qgsbench.cpp: maxdev must also be inited + Fix some memory management issues + aka reduce noise in valgrind memory analyzer -2011-11-27 Nathan Woodrow +Matthias Kuhn 2013-06-15 - * src/ui/qgsprojectionselectorbase.ui: Put 'Hide deprecated CRSs' - back to size 9 + [ftools] Further SIP API updates -2011-11-27 Radim Blazek +Nathan Woodrow 2013-06-15 - * tests/bench/qgsbench.cpp: array init fix + Fix python console for Python 2.6 -2011-11-27 Radim Blazek +Matthias Kuhn 2013-06-15 - * src/app/qgisapp.cpp, src/gui/qgsmapcanvasmap.cpp: Use QImage in - QgsMapCanvasMap by default, QImage was set by default from GUI, only - if a user applied options from gui, otherwise QPixmap (8x slower) - was used) + Fix memory leak in ogr provider -2011-11-27 Radim Blazek +Matthias Kuhn 2013-06-15 - * src/core/spatialindex/include/tools/PointerPool.h: missing - iostream + Fix memory leak in QgsFeature sip api -2011-11-27 Juergen E. Fischer +Matthias Kuhn 2013-06-15 - * i18n/qgis_de.ts: another german translation update + [ftools] Fix "Join attributes by location" -2011-11-27 Juergen E. Fischer +Chris Crook 2013-06-14 - * src/core/qgsexpression.cpp, src/core/qgsexpression.h, - src/core/qgsexpressionparser.yy, - src/gui/qgsexpressionbuilderwidget.cpp, - src/helpviewer/qgshelpviewer.cpp: add translation strings for - expression builder + Improved implementation -2011-11-27 Juergen E. Fischer +Chris Crook 2013-06-14 - * src/app/legend/qgslayerorder.cpp, src/app/legend/qgslayerorder.h: - missed new files of 46bc34df8c0312cd169f7a1e10305060437d5cfc + Som fTools fixes for SIP API updates -2011-11-26 Juergen E. Fischer +Merge: fec833f 964d7b4 +Matthias Kuhn 2013-06-15 - * debian/changelog, debian/qgis-common.install: debian packaging - update + Merge pull request #660 from minorua/grad_it + + fix a iteration -2011-11-26 Juergen E. Fischer +Leyan 2013-06-15 - * i18n/qgis_de.ts, resources/function_help/length-de_DE, - resources/function_help/lower-de_DE, - resources/function_help/replace-de_DE, - resources/function_help/replace-en_US, - resources/function_help/substr-de_DE, - resources/function_help/upper-de_DE, - src/providers/ogr/qgsogrprovider.cpp: german translation update + Update CRS cache when deleting a custom CRS -2011-11-26 Juergen E. Fischer +Minoru Akagi 2013-06-15 - * src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp, - src/app/legend/qgslegend.h, src/app/legend/qgslegendlayer.cpp, - src/app/legend/qgslegendlayer.h, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/core/qgsmaprenderer.cpp, - src/core/qgsvectorlayer.cpp, src/gui/qgsmapcanvas.cpp: [FEATURE] - allow legend independant drawing order + fix a iteration -2011-11-26 Juergen E. Fischer +Nathan Woodrow 2013-06-15 - * src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrprovider.cpp: add log messages to OGR - provider + Fix crash when creating/loading projects. Fixes #7931 -2011-11-26 Juergen E. Fischer +Merge: 9f3a879 abcc8b1 +Nathan Woodrow 2013-06-14 - * src/core/qgsexpression.cpp, src/gui/qgsmessagelogviewer.cpp, - src/gui/qgsmessagelogviewer.h, src/ui/qgsmessagelogviewer.ui: make - log tabs closable + Merge pull request #659 from slarosa/fix_8065 + + [DB Manager] Fixes #8065 -2011-11-26 Juergen E. Fischer +Juergen E. Fischer 2013-06-15 - * src/analysis/interpolation/DualEdgeTriangulation.h, - src/analysis/interpolation/Node.h, - src/analysis/interpolation/ParametricLine.cc, - src/analysis/interpolation/Point3D.h, - src/app/ogr/qgsnewogrconnection.cpp, - src/app/qgsdecorationnortharrow.cpp, src/app/qgslabelinggui.cpp, - src/browser/main.cpp, src/core/composer/qgscomposermap.cpp, - src/core/qgsmaplayerregistry.cpp, src/core/qgspallabeling.cpp, - src/core/qgsproviderregistry.cpp, src/core/qgssearchtreenode.cpp, - src/core/spatialindex/include/tools/Tools.h, - src/plugins/delimited_text/qgsdelimitedtextplugin.cpp, - src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h, - src/plugins/georeferencer/qgsimagewarper.cpp, - src/plugins/gps_importer/qgsgpsdevicedialog.cpp, - src/plugins/gps_importer/qgsgpsplugingui.cpp, - src/plugins/spit/qgsspit.cpp, src/providers/gpx/qgsgpxprovider.cpp, - src/providers/osm/osmhandler.cpp: remove unnecessary iostream - includes + also handle ringless polygons with GEOS <3.3 (follows 6370153e) -2011-11-26 Martin Dobias +Salvatore Larosa 2013-06-15 - * python/gui/symbology-ng-gui.sip, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.h, - src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/gui/symbology-ng/qgsrendererv2widget.h, - src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h, - src/ui/qgsrendererv2propsdialogbase.ui: Moved symbol levels button - under renderer's advanced menu + Fixes #8065 -2011-11-26 Martin Dobias +Etienne Tourigny 2013-06-14 - * src/core/qgsvectorlayer.cpp, - src/core/symbology-ng/qgscategorizedsymbolrendererv2.h, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgssinglesymbolrendererv2.h: Introduce - capabilities for renderers (now only symbol levels capability) + fix GdalTools contour -2011-11-26 Martin Dobias +Etienne Tourigny 2013-06-14 - * src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui: Move rules up/down instead - of inc/dec priorities + fix GdalTools assign and extract projection -2011-11-25 Martin Dobias +Etienne Tourigny 2013-06-14 - * src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui: Remove "first rule" and "use - symbol levels" options + fix GdalTools warp -2011-11-25 Martin Dobias +Etienne Tourigny 2013-06-14 - * src/core/qgsvectorlayer.cpp, - src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h: Support multiple - matching rules per feature, always using symbol levels + fix gdaltools merge, tileindex and info -2011-11-25 Sandro Santilli +Marco Hugentobler 2013-06-14 - * src/providers/postgres/qgspostgresprovider.cpp: Simplify - generation of SQL query for selecting features in a box. This is propedeutic to upcoming changes related to boxes in PostGIS - 2.0 + Prevent crash in case of invalid geometries -2011-11-21 Sandro Santilli +Juergen E. Fischer 2013-06-14 - * src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: [FEATURE] Detect - topology support + add a special value to update threshold spinbox (follows e09683b1) -2011-11-25 Juergen E. Fischer +Etienne Tourigny 2013-06-14 - * src/core/qgsdistancearea.cpp, src/core/qgsmimedatautils.cpp, - src/core/qgsproviderregistry.cpp, src/core/qgsvectorlayerimport.cpp: - log more error messages + replace QgsRasterLayer::buildSupportedRasterFileFilter() with QgsProviderRegistry::instance()->fileRasterFilters() -2011-11-25 Juergen E. Fischer +Werner Macho 2013-06-14 - * i18n/qgis_de.ts: german translation update + translation update: adding new finnish translator and language update -2011-11-25 Juergen E. Fischer +Juergen E. Fischer 2013-06-11 - * src/providers/postgres/qgspgnewconnection.cpp: default postigis - geometry columns lookups in the meta data only + some translation string fixes and german translation update -2011-11-25 Marco Hugentobler +Juergen E. Fischer 2013-06-14 - * python/core/qgscomposition.sip, - src/app/composer/qgscompositionwidget.cpp, - src/app/composer/qgscompositionwidget.h, - src/core/composer/qgscomposeritem.cpp, - src/core/composer/qgscomposition.cpp, - src/core/composer/qgscomposition.h, - src/ui/qgscompositionwidgetbase.ui: [FEATURE]: allow item selection - tolerance in composer (default is 0) + run stacktrace to c++filt automatically, when available -2011-11-25 Sergey Yakushev +Marco Hugentobler 2013-06-14 - * src/analysis/network/qgsgraphanalyzer.cpp: fix QgsGraphAnalyzer: a - bad result if the source is a symmetric graph + --amend -2011-11-25 Tim Sutton +Marco Hugentobler 2013-06-14 - * : Resolved merge conflicts + Update also crs transform cache if a crs has been updated -2011-11-24 Tim Sutton +Leyan 2013-06-14 - * : Resolved merge conflicts + add an update CRS cache function, still not effective though -2011-11-24 Tim Sutton +Borys Jurgiel 2013-06-14 - * : commit 23ce247f1cd27d6af2941249ad4a02031d6bcb1c Author: Juergen - E. Fischer Date: Thu Nov 24 14:54:04 2011 +0100 + [Plugin Manager] Don't crash on invalid values from QSettings -2011-11-24 Juergen E. Fischer +Borys Jurgiel 2013-06-14 - * images/images.qrc, src/app/qgsoptions.cpp, - src/gui/attributetable/qgsattributetablememorymodel.h, - src/gui/attributetable/qgsattributetablemodel.cpp, - src/gui/attributetable/qgsattributetablemodel.h, - src/ui/qgsoptionsbase.ui: [FEATURE] add row cache for attribute - table + fix #8060 (new SIP API) -2011-11-24 Juergen E. Fischer +Larry Shaffer 2013-06-13 - * src/core/qgsproject.cpp: fix crash when project is not yet saved + Fix for #8052, QGIS 2.0 does not respect labels' scale-based visibility in projects from previous version + + - Also fix long standing unreported bug where scales closer than 1:1, e.g. 5:1, could not be set -2011-11-24 Tim Sutton +Merge: e09683b aeffe2a +Werner Macho 2013-06-13 - * : commit 52eb8fd7be277c5c19d91f0d4b3002e1fdc9f4df Author: Tim - Sutton Date: Thu Nov 24 07:24:30 2011 +0200 + Merge pull request #654 from imincik/slovak + + Slovak translation update. -2011-11-24 Marco BErnasocchi +Ivan Mincik 2013-06-13 - * src/app/qgspluginregistry.cpp, src/core/qgsproviderregistry.cpp: - fix for issue 4224: - plugins are loaded only if called *plugin.so - providers are loaded only if called *provider.so + Slovak translation update. -2011-11-23 Tim Sutton +Radim Blazek 2013-06-13 - * doc/qgisdoc.css, resources/css/qgisdoc.css, - resources/html/qgsrasterlayer.html, src/app/main.cpp, - src/app/qgsrasterlayerproperties.cpp: Enable html inspection of web - views in debug mode + set min updateThreshold to 1000 -2011-11-23 Tim Sutton +nyalldawson 2013-06-12 - * resources/CMakeLists.txt, resources/css/CMakeLists.txt, - resources/css/ie.css, resources/css/print.css, - resources/css/screen.css, resources/html/qgsrasterlayer.html, - resources/js/json.js, src/app/qgsrasterlayerproperties.cpp, - src/app/qgsrasterlayerproperties.h, src/core/qgsmaplayer.h, - src/core/qgsrasterdataprovider.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/ui/qgsrasterlayerpropertiesbase.ui: Updates for html interaction - with qgis - raster metadata revamp + Also disable color buttons which don't apply for numeric scale bars + Make numeric scale bars respect font color and alignment settings (fix #7830) -2011-11-23 Nathan Woodrow +nyalldawson 2013-06-12 - * python/gui/qgsprojectionselector.sip, - src/core/qgsapplication.cpp, - src/gui/qgsgenericprojectionselector.cpp, - src/gui/qgsprojectionselector.cpp, src/gui/qgsprojectionselector.h, - src/ui/qgsprojectionselectorbase.ui: UI tweaks to the projection UI; - Remove old buttons and code etc + When scale bar is numeric disable controls which don't apply + Don't change scale bar box size automatically when style is numeric + Remove duplicate call to adjustBoxSize when scale bar font changes -2011-11-23 Tim Sutton +Radim Blazek 2013-06-13 - * src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/mapserver/qgis_map_serv.cpp, tests/bench/main.cpp: Further - updates to places provider registry called pluginPath to make it use - providerPath now + dont translate names in customization tree, fixes #8039 -2011-11-23 Marco BErnasocchi +D'Hont René-Luc 2013-06-03 - * src/analysis/CMakeLists.txt, src/analysis/network/CMakeLists.txt, - src/core/CMakeLists.txt, src/gui/CMakeLists.txt, - src/providers/grass/CMakeLists.txt, - src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt, - src/python/CMakeLists.txt: Added support for unversioned libs for - android + [Feature][QGIS-Server] Specifying url for QgsComposerHtml in GetPRint Request + + The idea is to add the capability to specify an URL to a QgsComposerHtml + element in the GetPrint request. + This will give the ability to get PDF with content base on a web + service. -2011-11-22 Tim Sutton +Borys Jurgiel 2013-06-12 - * resources/html/chart.html, src/app/qgsrasterlayerproperties.cpp: - Further updates to flot histogram implementation - added legend and - try to map colours more intelligently + [Plugin Manager] Plugin installer fixes -2011-11-22 Tim Sutton +Radim Blazek 2013-06-12 - * : commit 376adc4dab9f20024f9486759bccdf4a37485d7b Author: Juergen - E. Fischer Date: Tue Nov 22 16:01:46 2011 +0100 + customization update -2011-11-22 Tim Sutton +Radim Blazek 2013-06-12 - * : Merge pull request #59 from NathanW2/window_theme [FEATURE] Allow the user to select the Qt windows style they want + GRASS feature id fix, tables selection id fix, fixes #6451 -2011-11-22 Richard Duivenvoorde +Matthias Kuhn 2013-06-12 - * src/gui/qgsprojectionselector.cpp, - src/gui/qgsprojectionselector.h, - src/ui/qgsprojectionselectorbase.ui: for #4550 projection ui work + Don't crash if embedded group cannot be loaded (Fix #7872) -2011-11-21 marco +Radim Blazek 2013-06-12 - * src/core/symbology-ng/qgspointdisplacementrenderer.cpp: Point - displacement renderer: fix loading embeded renderers + Updated towgs84 parameters of geographic JTSK CRS, the towgs84 values were calculated for area of Czech and Slovak Republic as it is described here: http://grass.fsv.cvut.cz/gwiki/%C4%8Ceskoslovensk%C3%BD_transforma%C4%8Dn%C3%AD_kl%C3%AD%C4%8D + + UPDATE tbl_srs set parameters = '+proj=longlat +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +no_defs' WHERE auth_id = '4156'; + + UPDATE tbl_srs set parameters = '+proj=longlat +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=ferro +no_defs' WHERE auth_id = '4818'; -2011-11-21 Tim Sutton +Radim Blazek 2013-06-12 - * src/app/qgsrasterlayerproperties.cpp: Make save as image work for - new histogram implementation + Updated towgs84 parameters of JTSK CRS, the towgs84 values were calculated for area of Czech and Slovak Republic as it is described here: http://grass.fsv.cvut.cz/gwiki/%C4%8Ceskoslovensk%C3%BD_transforma%C4%8Dn%C3%AD_kl%C3%AD%C4%8D + + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=greenwich +units=m +no_defs' WHERE auth_id = '5513'; + + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=greenwich +units=m +no_defs' WHERE auth_id = '5514'; + + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=42.5 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=ferro +units=m +no_defs' WHERE auth_id = '5221'; + + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=42.5 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=ferro +units=m +no_defs' WHERE auth_id = '2065'; + + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=greenwich +units=m +no_defs' WHERE auth_id = '102067'; -2011-11-21 Radim Blazek +Radim Blazek 2013-06-12 - * tests/bench/main.cpp, tests/bench/qgsbench.cpp, - tests/bench/qgsbench.h: Dont use QgsApplication, --prefix, json fix + raster DrawingStyle to QgsRaster to avoid circular header include -2011-11-21 Tim Sutton +Radim Blazek 2013-06-12 - * resources/html/chart.html, src/app/qgsrasterlayerproperties.cpp, - src/app/qgsrasterlayerproperties.h: Fix refresh of histogram when - tab is already active + customisation script moved, removed & from customisation menu items labels -2011-11-21 Tim Sutton +Nathan Woodrow 2013-06-12 - * resources/html/chart.html: Improvements to graph - allow - interactive pan & zoom + Don't return null on failed metadata load -2011-11-21 Tim Sutton +Merge: a602112 3b4dfd7 +Salvatore Larosa 2013-06-11 - * resources/CMakeLists.txt, src/app/qgsrasterlayerproperties.cpp, - src/ui/qgsrasterlayerpropertiesbase.ui: Further updates to flot - graphing for raster histogram + Merge pull request #619 from slarosa/generate_pap + + [FEATURE] Module to generate prepared APIs file for call tips and auto-completion in Python Console -2011-11-21 Sergey Yakushev +Borys Jurgiel 2013-06-12 - * src/plugins/roadgraph/linevectorlayerwidget.cpp: fix Road graph - plugin: enable geometry type filter + [Plugin Manager] installer fix -2011-11-20 Tim Sutton +Nathan Woodrow 2013-06-12 - * : Merge pull request #64 from rouault/master OGR provider: don't segfault when the layer cannot be retrieved - (e.g. datasource with 0 layer) + Fix build error -2011-11-20 Tim Sutton +Nathan Woodrow 2013-06-12 - * resources/html/CMakeLists.txt, resources/html/chart.html, - resources/js/API.txt, resources/js/CMakeLists.txt, - resources/js/FAQ.txt, resources/js/LICENSE.txt, - resources/js/NEWS.txt, resources/js/PLUGINS.txt, - resources/js/README.txt, resources/js/excanvas.js, - resources/js/excanvas.min.js, resources/js/jquery.colorhelpers.js, - resources/js/jquery.colorhelpers.min.js, - resources/js/jquery.flot.crosshair.js, - resources/js/jquery.flot.crosshair.min.js, - resources/js/jquery.flot.fillbetween.js, - resources/js/jquery.flot.fillbetween.min.js, - resources/js/jquery.flot.grow.js, - resources/js/jquery.flot.image.js, - resources/js/jquery.flot.image.min.js, resources/js/jquery.flot.js, - resources/js/jquery.flot.min.js, - resources/js/jquery.flot.navigate.js, - resources/js/jquery.flot.navigate.min.js, - resources/js/jquery.flot.pie.js, - resources/js/jquery.flot.pie.min.js, - resources/js/jquery.flot.resize.js, - resources/js/jquery.flot.resize.min.js, - resources/js/jquery.flot.selection.js, - resources/js/jquery.flot.selection.min.js, - resources/js/jquery.flot.stack.js, - resources/js/jquery.flot.stack.min.js, - resources/js/jquery.flot.symbol.js, - resources/js/jquery.flot.symbol.min.js, - resources/js/jquery.flot.threshold.js, - resources/js/jquery.flot.threshold.min.js, resources/js/jquery.js, - resources/js/jquery.min.js: Further implementation of flot based - graphing for raster stats + Fix python indentation -2011-11-20 Radim Blazek +Nathan Woodrow 2013-06-12 - * tests/CMakeLists.txt, tests/bench/CMakeLists.txt, - tests/bench/README, tests/bench/main.cpp, tests/bench/qgsbench.cpp, - tests/bench/qgsbench.h: benchmark program + Don't patch QPyNullVariant if it doesn't exist -2011-11-20 Tim Sutton +Nathan Woodrow 2013-06-12 - * resources/CMakeLists.txt, src/app/CMakeLists.txt, - src/app/qgsrasterlayerproperties.cpp, - src/ui/qgsrasterlayerpropertiesbase.ui: In progress work to replace - qwt with flot for raster histogram + Fix #8040. Build error with sip -2011-11-19 Tim Sutton +Victor Olaya 2013-06-12 - * src/core/qgsapplication.cpp, src/core/qgsapplication.h: Fixed bug - in showSettings output and noted that providerPath is new to 2.0 api + [sextante] improved modeler appearance -2011-11-19 Tim Sutton +Borys Jurgiel 2013-06-11 - * CMakeLists.txt, cmake_templates/qgsconfig.h.in, - src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/providers/CMakeLists.txt, - src/providers/delimitedtext/CMakeLists.txt, - src/providers/gdal/CMakeLists.txt, - src/providers/gpx/CMakeLists.txt, - src/providers/grass/CMakeLists.txt, - src/providers/memory/CMakeLists.txt, - src/providers/ogr/CMakeLists.txt, src/providers/osm/CMakeLists.txt, - src/providers/postgres/CMakeLists.txt, - src/providers/spatialite/CMakeLists.txt, - src/providers/sqlanywhere/CMakeLists.txt, - src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt, - src/providers/wfs/CMakeLists.txt, src/providers/wms/CMakeLists.txt: - Keep providers in a separate dir to plugins + [Plugin Manager] Fix the recent commit -2011-11-19 Nathan Woodrow +Borys Jurgiel 2013-06-11 - * src/gui/qgsmessagelogviewer.cpp, src/ui/qgsmessagelogviewer.ui: - Reduce margins; hide row header; use DotLine for grid; reduce - spacing between rows + [Plugin Manager] Translateable name and description in metadata.txt. -2011-11-18 Juergen E. Fischer +Borys Jurgiel 2013-06-11 - * python/core/core.sip, python/core/qgsmessagelog.sip, - src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgspluginregistry.cpp, src/core/CMakeLists.txt, - src/core/qgsmessagelog.cpp, src/core/qgsmessagelog.h, - src/gui/CMakeLists.txt, src/gui/qgsmessagelogviewer.cpp, - src/gui/qgsmessagelogviewer.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/wms/qgswmsprovider.cpp, src/ui/qgsmessagelogviewer.ui: - [FEATURE] message log window + [Plugin Manager] Prevent from removing the official repository -2011-11-18 Juergen E. Fischer +Borys Jurgiel 2013-06-11 - * src/app/qgisapp.cpp: fix tab restoration in project properties + [Plugin manager] Minor GUI tweaks -2011-11-18 Juergen E. Fischer +Borys Jurgiel 2013-06-11 - * src/core/qgsproject.cpp: make relative paths default + Translation update: pl -2011-11-18 Giuseppe Sucameli +Borys Jurgiel 2013-06-11 - * : commit 8f33367ffde55e3f8e81e7d7a7c2aaa5d727b26c Author: Giuseppe - Sucameli Date: Fri Nov 18 15:44:19 2011 - +0100 + [Plugin Manage] Include tab title pages to i18n. Don't clutter the resources dir. -2011-11-18 Marco Hugentobler +Merge: 031550a 84eb6f8 +Borys Jurgiel 2013-06-11 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp: Initialize - default symbol to 0 in rule based renderer + Merge pull request #652 from jetuk/pyplugin_installer-QNAM + + pyplugin_installer moved to QNetworkAccessManager from QHttp -2011-11-17 Tim Sutton +James Tomlinson 2013-06-11 - * CHANGELOG, doc/SPONSORS, doc/changelog.t2t, - src/ui/qgssponsorsbase.ui: Backport 1.7 changelog changes and - updated sponsors to include Uster + pyplugin_installer moved to QNetworkAccessManager from QHttp -2011-11-17 Martin Dobias +Werner Macho 2013-06-11 - * src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.h, - src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: [FEATURE] Delete - SpatiaLite tables from browser + translation update by Calvin -2011-11-17 Martin Dobias +Salvatore Larosa 2013-06-11 - * src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: Optimize - SpatiaLite feature reading speed + [pyqgis-console] improving to auto closing bracket -2011-11-17 Giuseppe Sucameli +Salvatore Larosa 2013-06-11 - * src/plugins/grass/qgsgrassmodule.cpp: fix #4465 to make the GRASS - plugin working with GRASS 6.4.2RC2 + [pyqgis-console] removes console/help folder: + it is no longer necessary, now it is into context help -2011-11-17 Nathan Woodrow +Salvatore Larosa 2013-06-11 - * : Merge upstream/master; fix conflicts + [pyqgis-console] another updating to new SIP API -2011-11-17 Nathan Woodrow +Merge: 6381d62 ba4a3cc +Nathan Woodrow 2013-06-11 - * src/app/main.cpp: Use null string vs empty + Merge pull request #625 from vinayan/projcrash + + [Fix #7964] Ftools-Sum Line length - Fix progress bar -2011-11-17 Juergen E. Fischer +Matthias Kuhn 2013-06-10 - * src/core/qgsmimedatautils.h: fix windows build + Use python None object for NULL attributes -2011-11-17 Werner Macho +Merge: 8392c93 8cd8969 +Giuseppe Sucameli 2013-06-11 - * : commit 608e7d05ba6b8dc51d4e2f27c5dbe0281659481a Author: Werner - Macho Date: Thu Nov 17 11:29:04 2011 - +0100 + Merge pull request #651 from slarosa/fix_dbmanager + + [DB Manager] fix for PostGIS Raster Layer -2011-11-17 Werner Macho +Salvatore Larosa 2013-06-11 - * i18n/qgis_gl_ES.ts, i18n/qgis_no.ts: translation: added galician - language on request - some changes to new norwegian language + [DB Manager] fix for PostGIS Raster Layer -2011-11-17 Marco Hugentobler +Salvatore Larosa 2013-06-11 - * src/mapserver/qgsprojectparser.cpp: WMS server: another correction - to correctly support embedded layers and groups + [FEATURE] [pyqgis-console] Module to generate prepared APIs for calltips and auto-completion -2011-11-17 Juergen E. Fischer +Nathan Woodrow 2013-06-11 - * ms-windows/osgeo4w/package-nightly.cmd: osgeo4w update: use GRASS - 6.4.2RC2 + Monkey patch __nonzero__ onto QPyNullVariant for easier null check. + + Who doesn't love monkeys :) -2011-11-17 Tim Sutton +D'Hont René-Luc 2013-06-08 - * CMakeLists.txt: Added make check command for Sandro Santilli and - other gnu make officianados + [FEATURE] Add DataUrl to layer's metadata + + Like keyword list, attribution and metadata url, this information is + used by QGIS Server in WMS GetCapabilities and GetContext Request. + The user can add an url where he can find information about the layer. -2011-11-17 Tim Sutton +Juergen E. Fischer 2013-06-11 - * : commit c585a49febf4a6807a26f5aff76a24ae27efc91e Author: Juergen - E. Fischer Date: Wed Nov 16 23:11:57 2011 +0100 + also update networkanalysis.sip (following 61e101dd4) -2011-11-16 Martin Dobias +Juergen E. Fischer 2013-06-11 - * src/app/qgisapp.cpp, src/app/qgsbrowserdockwidget.cpp, - src/core/CMakeLists.txt, src/core/qgsbrowsermodel.cpp, - src/core/qgsbrowsermodel.h, src/core/qgsdataitem.h, - src/core/qgsmimedatautils.cpp, src/core/qgsmimedatautils.h, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.h: [FEAUTRE] Import - of vectors to SpatiaLite in browser + move MIME type stuff to a - separate file + debian packaging: replace %Module directive in header for older sip versions in squeeze and lucid (following 61e101dd4) -2011-11-16 Martin Dobias +Nathan Woodrow 2013-06-11 - * src/app/spatialite/qgsnewspatialitelayerdialog.cpp, - src/app/spatialite/qgsnewspatialitelayerdialog.h, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.h, - src/providers/spatialite/qgsspatialiteprovider.cpp: Move creation of - SpatiaLite DB to provider + option to create DB from browser + Fix #8034. Sextante SIP update -2011-11-16 Tim Sutton +Nathan Woodrow 2013-06-11 - * tests/src/core/testqgspoint.cpp: Fixes so qgspoint unit tests all - pass + Fix #8035. Sip update for plugin installer -2011-11-16 Alexander Bruy +Nathan Woodrow 2013-06-11 - * python/core/qgsvectorfieldsymbollayer.sip: fix build error - introduced in ed13141b67 + Fix Python init function call -2011-11-16 Werner Macho +Borys Jurgiel 2013-06-10 - * : Merge remote-tracking branch 'upstream/master' + [Plugin Manager] Minor gui tweaks -2011-11-16 Werner Macho +Borys Jurgiel 2013-06-10 - * i18n/qgis_no.ts: translation update: added norwegian on request + [Plugin Manager] Make appropriate methods const -2011-11-16 Marco Bernasocchi +Merge: 499db4e 6558b53 +Werner Macho 2013-06-10 - * src/app/qtmain_android.cpp: changed app class path + Merge pull request #650 from imincik/slovak + + Slovak translation update. -2011-11-16 Juergen E. Fischer +Ivan Mincik 2013-06-05 - * python/CMakeLists.txt: fix creatation of python output directory - on windows + Slovak translation update. -2011-11-16 marco +Radim Blazek 2013-06-10 - * src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h: Better implementation of - QgsProjectParser::mapLayerFromStyle + composer legend spacing corrected, fixes #7994 -2011-11-16 Juergen E. Fischer +Borys Jurgiel 2013-06-10 - * debian/changelog: debian packaging update + [Plugin Manager] Maximum major, minor and bugfix version is 99.99.99. Be consistent with this constraint. -2011-11-15 Martin Dobias +Merge: 430f0fc a857434 +Werner Macho 2013-06-09 - * src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h: Fix #4511 - - refreshing of Postgres tables + Merge pull request #645 from qgis-jp/make_pull_req_from_ja + + update GUI translation JA woked with Minoru Akagi -2011-11-15 Juergen E. Fischer +yoichigmf 2013-06-10 - * ms-windows/osgeo4w/package-nightly.cmd, src/app/qgisapp.cpp, - tests/src/core/testqgsexpression.cpp: fix windows build and include - tests runs in nightly build + update GUI translation JA woked with Minoru Akagi -2011-11-15 Marco Hugentobler +Larry Shaffer 2013-06-09 - * python/core/core.sip, python/core/qgsvectorfieldsymbollayer.sip, - python/core/symbology-ng-core.sip: Added python bindings for vector - field symbollayer + Add user notification when defined labeling font is not found on system, then substituted + + - [API] add signal to QgsVectorLayer that is emitted when its labeling font is not found + - Message bar notification on first rendering of layer offers link to open layer's labeling dialog + - Add 'font not found' notification to labeling dialog + - Labeling dialog defaults to 'Text style' section when font is not found, to show notice + - Substituted font is not saved with project, unless user applies changes. + - Change labeling gui font selector dialog to font family combobox (since only family is being chosen) -2011-11-14 marco +Larry Shaffer 2013-06-09 - * src/mapserver/qgis_map_serv.cpp: Flag to allow usage of QGIS - server with an x-server (vector pdf output for patterns) + Update label gui and rendering with QgsFontUtils functions -2011-11-14 Tim Sutton +Larry Shaffer 2013-06-09 - * tests/src/core/testqgscoordinatereferencesystem.cpp: Partial fix - to coordinate reference system unit tests + Add QgsFontUtils class to handle system font queries and style changes -2011-11-14 Tim Sutton +Larry Shaffer 2013-06-09 - * tests/src/core/testqgsrenderers.cpp, - tests/testdata/polys_uniquevalue_symbol.qml: Make more tests work - - only 4/16 fail now + Check only what's necessary to see if a layer will be labeled + + - Don't load all settings from QgsPalLayerSettings::readFromLayer -2011-11-14 Tim Sutton +Larry Shaffer 2013-06-09 - * tests/src/core/regression992.cpp: Updates for regression992 test - - test should work but raster still introduces some difference which I - am working to figure out why + Followup to b383c69. Keep labeling dialog from calling init() twice from vector props dialog -2011-11-14 Tim Sutton +Borys Jurgiel 2013-06-10 - * src/analysis/vector/qgsgeometryanalyzer.cpp, - src/core/qgsapplication.h, - tests/src/analysis/testqgsvectoranalyzer.cpp: Fix problem with - analyzer test + Update core plugins qgisMinimumVersion to 2.0 -2011-11-14 Tim Sutton +Borys Jurgiel 2013-06-10 - * tests/src/core/regression992.cpp, - tests/src/core/testcontrastenhancements.cpp, - tests/src/core/testqgscoordinatereferencesystem.cpp, - tests/src/core/testqgsgeometry.cpp, - tests/src/core/testqgsmaprenderer.cpp, - tests/src/core/testqgspoint.cpp, - tests/src/core/testqgsrasterlayer.cpp, - tests/src/core/testqgsrenderers.cpp, - tests/src/core/testqgsvectorlayer.cpp: Further updates to the unit - tests - still not all passing yet + [Plugin Manager] Fix for compatibility check in QgsPluginInstaller and QgsPluginRegistry -2011-11-14 Tim Sutton +Nathan Woodrow 2013-06-09 - * : commit e54680dbdd03e80a771f49f001a04e1b42c8fec8 Author: Tim - Sutton Date: Mon Nov 14 13:14:25 2011 +0200 + Allow keyword args in Python classes. Fix sip headers -2011-11-14 marco +Nathan Woodrow 2013-06-03 - * src/app/qgsmaptoolnodetool.cpp: Save some time in node tool for - geometry export and avoid detachs + Add __getattr__ and __setattr__ to QgsFeature -2011-11-14 Tim Sutton +Borys Jurgiel 2013-06-09 - * CMakeLists.txt: Enable tests by default + [Plugin Manager] Temporarily hardcode QGIS_VERSION=2.0.0 in the QgsPluginInstaller and QgsPluginRegistry to allow proper version comparision until it's globally set before the release. -2011-11-13 Tim Sutton +Borys Jurgiel 2013-06-09 - * : Merge pull request #61 from rduivenvoorde/cf849875 fix for #4500 + Check qgsMaximumVersion also when loading plugin to QgsPluginRegistry -2011-11-13 Richard Duivenvoorde +Merge: dbace48 ce9ed15 +Borys Jurgiel 2013-06-09 - * src/app/qgsmaptoolsimplify.cpp: fix for #4500, endlessloop because - of too small tolerance + Merge pull request #641 from rduivenvoorde/pluginmantxt + + [Plugin Manager] texts and context help text for pluginmanager -2011-11-13 Sandro Santilli +Werner Macho 2013-06-09 - * src/providers/postgres/qgspostgresprovider.cpp: Add support for - TopoGeometry datatype (don't get too excited) + translation update: zh_CN by Calvin -2011-11-13 Juergen E. Fischer +Werner Macho 2013-06-09 - * src/app/qgisapp.cpp: update qgisapp for new codename + translation update: ro by Bogdan Pacurar -2011-11-13 Alexander Bruy +Richard Duivenvoorde 2013-06-09 - * src/ui/qgsoptionsbase.ui: [BP18] wrap long label in Options dialog - to avoid horizontal scrolling + delete unused resource files + + if I understand jef correctly, these files are all not used anymore (plz correct + me if I'm wrong). + The build and scripts incorporate the en_US resource files in the corresponding + i18n/qgis_**.ts files (by creating cpp from it). -2011-11-13 Juergen E. Fischer +Richard Duivenvoorde 2013-06-09 - * i18n/qgis_de.ts: german translation update + purge olde PluginInstallerDialog context help + + there will be a new QgsPluginManager help file -2011-11-13 pcav +Richard Duivenvoorde 2013-06-09 - * : commit d52c510eaad3707a96e99fcc493e39575424b46f Author: marco - Date: Sun Nov 13 14:26:27 2011 +0100 + purge old doc/plugins directory -2011-11-13 Marco Bernasocchi +Juergen E. Fischer 2013-06-09 - * : commit 27e770a5025f5e5e5ba833250c057f4631b81a05 Author: pcav - Date: Wed Oct 19 17:31:46 2011 +0200 + QGis => QGIS updates -2011-11-13 Alexander Bruy +Richard Duivenvoorde 2013-06-09 - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/resources.qrc, - python/plugins/GdalTools/tools/doFillNodata.py, - python/plugins/GdalTools/tools/widgetFillNodata.ui: [FEATURE] add - gdal_fillnodata to GdalTools + texts and context help text for pluginmanager -2011-11-13 Alexander Bruy +Juergen E. Fischer 2013-06-09 - * python/plugins/GdalTools/tools/doProjection.py: [BACKPORT] fix - broken Assign projection functionality in GDALTools and improve - handling output file extension + more QuantumGIS => QGIS updates -2011-11-13 Nathan Woodrow +Juergen E. Fischer 2013-06-09 - * src/ui/qgsoptionsbase.ui: Add note about restart required + german translation update -2011-11-13 Nathan Woodrow +Juergen E. Fischer 2013-06-09 - * src/app/main.cpp, src/app/qgsoptions.cpp, - src/ui/qgsoptionsbase.ui: Allow user to select Qt app style + dbmanager: add i18n -2011-11-13 Tim Sutton +Borys Jurgiel 2013-06-09 - * CMakeLists.txt: Updated version number and splash for master - branch + Set Qsettings' ApplicationName to QGIS2 everywhere in src -2011-11-13 Tim Sutton +Borys Jurgiel 2013-06-09 - * : commit 1148aaf72ed8c85c14f7b43c84ec336c339cdcbb Author: Tim - Sutton Date: Sun Nov 13 02:29:12 2011 +0200 + [Plugin Manager] Forgotten CMake entry. Following c490688106941be91e5 -2011-11-12 Alexander Bruy +Borys Jurgiel 2013-06-09 - * python/plugins/fTools/tools/doGeoprocessing.py: [BACKPORT] Union - and Symetrical difference works only on whole layer + [PluginManager] Move title pages for tabs to the resources. Will be included to translations when the contents is ready. -2011-11-12 Alexander Bruy +Victor Olaya 2013-06-09 - * python/plugins/fTools/tools/doGeoprocessing.py: [BACKPORT] fix - holes in Union output (fix #3581) + [sextante] removed debug code -2011-11-12 Werner Macho +Victor Olaya 2013-06-09 - * : Merge pull request #58 from Jean-Roc/master [BP18] Update french UI + [sextante] more work on updating to new SIP API -2011-11-12 Alexander Bruy +Borys Jurgiel 2013-06-09 - * src/app/qgisapp.cpp: [BACKPORT] add What's this to Help menu - (implement #4179) + [PluginManager] Filter by repository under rightclick on the repo list (only active if > 1 repo configured) -2011-11-12 Juergen E. Fischer +Juergen E. Fischer 2013-06-09 - * i18n/qgis_de.ts, scripts/update_ts_files.sh, - scripts/update_ts_files_fedora.sh: german translation update + yet another german translation update -2011-11-12 Tim Sutton +Juergen E. Fischer 2013-06-09 - * : commit cf7b989a7e2c787c7f9882175d36e7e7d0e22b36 Author: Tim - Sutton Date: Sat Nov 12 13:39:03 2011 +0200 + allow utf8 in metadata.txt -2011-11-12 Tim Sutton +Borys Jurgiel 2013-06-09 - * python/plugins/plugin_installer/installer_data.py: Enable new repo - by default now too + [Plugon Manager] Fix compile error (follows abef7a5fe4d) -2011-11-12 Alexander Bruy +Borys Jurgiel 2013-06-09 - * python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/doGeoprocessing.py, - python/plugins/fTools/tools/doIntersectLines.py, - python/plugins/fTools/tools/doMeanCoords.py, - python/plugins/fTools/tools/doPointsInPolygon.py, - python/plugins/fTools/tools/doRandPoints.py, - python/plugins/fTools/tools/doRegPoints.py, - python/plugins/fTools/tools/doSimplify.py, - python/plugins/fTools/tools/doSumLines.py, - python/plugins/fTools/tools/doVectorGrid.py: [BACKPORT] fTools: - update layers lists after adding new layer to TOC (fix #4318) + [Plugin Installer] Better uninstall obsolete user plugins masking more recent versions installed as core -2011-11-12 Alexander Bruy +Borys Jurgiel 2013-06-08 - * python/plugins/fTools/fTools.py: [BACKPORT] don't block QGIS main - window when running Merge shapefiles tool. Partially addresses #4383 + [PluginManager] Code cleanup: keep one class per file also in Python -2011-11-12 Alexander Bruy +Salvatore Larosa 2013-06-08 - * python/plugins/fTools/__init__.py, - python/plugins/fTools/fTools.py, - python/plugins/fTools/tools/doDefineProj.py, - python/plugins/fTools/tools/doGeometry.py, - python/plugins/fTools/tools/doGeoprocessing.py, - python/plugins/fTools/tools/doIntersectLines.py, - python/plugins/fTools/tools/doMeanCoords.py, - python/plugins/fTools/tools/doMergeShapes.py, - python/plugins/fTools/tools/doPointDistance.py, - python/plugins/fTools/tools/doPointsInPolygon.py, - python/plugins/fTools/tools/doRandPoints.py, - python/plugins/fTools/tools/doRandom.py, - python/plugins/fTools/tools/doRegPoints.py, - python/plugins/fTools/tools/doSelectByLocation.py, - python/plugins/fTools/tools/doSpatialJoin.py, - python/plugins/fTools/tools/doSubsetSelect.py, - python/plugins/fTools/tools/doSumLines.py, - python/plugins/fTools/tools/doVectorGrid.py, - python/plugins/fTools/tools/doVectorSplit.py, - python/plugins/fTools/tools/doVisual.py, - python/plugins/fTools/tools/ftools_utils.py, - python/plugins/fTools/tools/voronoi.py: [BACKPORT] remove executable - flag from fTools sources + [pyqgis-console] fixes for the new SIP APIs -2011-11-12 Alexander Bruy +Borys Jurgiel 2013-06-08 - * python/plugins/fTools/fTools.py, - python/plugins/fTools/tools/doSimplify.py, - python/plugins/fTools/tools/frmSimplify.ui: [FEATURE] Densify - geometries tool for fTools (fix #3628). Still without icon + [Plugin Manager] Minor fixes and gui tweaks -2011-11-12 Alexander Bruy +Juergen E. Fischer 2013-06-08 - * python/plugins/fTools/fTools.py, - python/plugins/fTools/tools/doSpatialIndex.py, - python/plugins/fTools/tools/frmSpatialIndex.ui: [FEATURE] Build - spatial index tool for fTools (see #2779). Currently without icon + german translation update -2011-11-12 marco +Merge: 02c29c0 a939ab1 +Nathan Woodrow 2013-06-08 - * src/mapserver/qgssldparser.cpp: sld parser in qgis server is still - on old symbology + Merge SIP v2 update -2011-11-12 Werner Macho +Nathan Woodrow 2013-06-08 - * : Merge pull request #57 from Jean-Roc/master updates_ts script for fedora + update local + Sextante SIP update -2011-11-11 Jean-Roc Morreale +Nathan Woodrow 2013-06-08 - * scripts/update_ts_files_fedora.sh: adapt the script for fedora + Plugin installer sip update -2011-11-11 Martin Dobias +Nathan Woodrow 2013-06-08 - * src/app/qgsmaptoolnodetool.cpp: Do not validate the geometry if it - is known to be valid - save some time + Update plugin installer to new API -2011-11-11 Radim Blazek +Merge: 014d872 02c29c0 +Nathan Woodrow 2013-06-08 - * src/core/raster/qgsrasterlayer.cpp: correct source data type in - meta (instead of internal daty type used in QGIS) + Merge master -2011-11-08 Martin Dobias +Borys Jurgiel 2013-06-08 - * python/utils.py: [FEATURE] Allow plugin metadata to be in - metadata.txt Until now plugins' metadata were always retrieved from __init__.py - by calling python methods. Reading metadata from a text file has - the advantage of not requiring to load the plugin code and can be - done by plugin repository. Metadata in metadata.txt is preferred to the methods in __init__.py - - if the text file is present, it is used to fetch the values. From - QGIS 2.0 the metadata from __init__.py will not be accepted - the - metadata.txt file will be required. Plugin metadata should be in INI file format, recognized by python's - ConfigParser module and by Qt's QSettings class. All currently used metadata should be in [general] section. Example - use: [general] name=PostGIS manager description=Manage your PostGIS - database version=Version 0.5.15 icon=icons/postgis_elephant.png - qgisMinimumVersion=1.0.0 + [Plugin Manager] Better sorting by status, minor gui fixes and improvements -2011-11-09 Juergen E. Fischer +Juergen E. Fischer 2013-06-08 - * src/core/CMakeLists.txt: put spatialindex header directory in - front of GEOS - -2011-11-09 Sergey Yakushev - - * : Merge remote branch 'pb/master' - -2011-11-09 Giuseppe Sucameli - - * src/gui/qgsprojectionselector.cpp, - src/gui/qgsprojectionselector.h: fix for crash in projection - selection - -2011-11-08 Martin Dobias - - * src/core/pal/feature.cpp: Fix label orientation with line - dependent position (#3643) - -2011-11-08 Juergen E. Fischer - - * i18n/qgis_de.ts, src/providers/spatialite/CMakeLists.txt, - src/providers/spatialite/qgsspatialiteconnection.h: german - translation update - -2011-11-01 Martin Dobias - - * src/app/qgslabelinggui.cpp, src/ui/qgslabelingguibase.ui: More - intuitive setting for orientation of labels (map/line) - -2011-10-22 Sandro Santilli - - * src/app/qgslabelinggui.cpp, src/ui/qgslabelingguibase.ui: Disable - options related to interpretation and threatment of above/below line - labeling when online labeling is requested. - -2011-11-08 Marco Hugentobler - - * src/core/qgscoordinatereferencesystem.cpp: Fix detection of CRS - meter units - -2011-11-06 Martin Dobias - - * src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: Make sure that relevant fields - are set always when necessary. - -2011-10-04 Martin Dobias - - * src/providers/ogr/qgsogrprovider.cpp: Significantly improve OGR - fetching speed - set ignored field only on select() Beware: featureAtId() may interfere, this should be checked. - -2011-11-07 Juergen E. Fischer - - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - also consider int2 and int8 as primary candidates of views - -2011-10-28 Juergen E. Fischer - - * src/core/qgscoordinatereferencesystem.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: when intializing from WKT - favourize EPSG instead of PROJ.4 - -2011-11-07 Radim Blazek - - * src/plugins/grass/CMakeLists.txt, - src/plugins/grass/modules/CMakeLists.txt, - src/plugins/grass/modules/default.qgc, - src/plugins/grass/modules/r.surf.fractal.qgm, - src/plugins/grass/modules/v.buffer.qgm, - src/plugins/grass/modules/v.db.select.qgm, - src/plugins/grass/modules/v.db.select.where.qgm, - src/plugins/grass/modules/v.to.db.qgm, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassmodule.h, - src/plugins/grass/qgsgrasstools.cpp: GRASS version support - -2011-11-07 Radim Blazek - - * src/plugins/grass/modules-6.3/CMakeLists.txt, - src/plugins/grass/modules-6.3/default.qgc, - src/plugins/grass/modules-6.3/r.surf.fractal.qgm, - src/plugins/grass/modules-6.3/v.buffer.1.svg, - src/plugins/grass/modules-6.3/v.buffer.2.svg, - src/plugins/grass/modules-6.3/v.buffer.qgm, - src/plugins/grass/modules-6.3/v.db.select.qgm, - src/plugins/grass/modules-6.3/v.db.select.where.qgm, - src/plugins/grass/modules-6.3/v.out.ogr.postgis.qgm, - src/plugins/grass/modules-6.3/v.to.db.qgm, - src/plugins/grass/modules-6.4/CMakeLists.txt, - src/plugins/grass/modules-6.4/db.connect-login.pg.qgm, - src/plugins/grass/modules-6.4/db.out.ogr.qgm, - src/plugins/grass/modules-6.4/default.qgc, - src/plugins/grass/modules-6.4/r.bilinear.qgm, - src/plugins/grass/modules-6.4/r.colors.stddev.qgm, - src/plugins/grass/modules-6.4/r.external.all.qgm, - src/plugins/grass/modules-6.4/r.external.qgis.qgm, - src/plugins/grass/modules-6.4/r.external.qgm, - src/plugins/grass/modules-6.4/r.grow.distance.qgm, - src/plugins/grass/modules-6.4/r.surf.fractal.qgm, - src/plugins/grass/modules-6.4/v.buffer.1.svg, - src/plugins/grass/modules-6.4/v.buffer.2.svg, - src/plugins/grass/modules-6.4/v.buffer.qgm, - src/plugins/grass/modules-6.4/v.db.dropcol.qgm, - src/plugins/grass/modules-6.4/v.db.select.qgm, - src/plugins/grass/modules-6.4/v.db.select.where.qgm, - src/plugins/grass/modules-6.4/v.in.geonames.1.svg, - src/plugins/grass/modules-6.4/v.in.geonames.qgm, - src/plugins/grass/modules-6.4/v.in.gns.qgm, - src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm, - src/plugins/grass/modules-6.4/v.to.db.qgm, - src/plugins/grass/modules-common/CMakeLists.txt, - src/plugins/grass/modules-common/db-connect.1.svg, - src/plugins/grass/modules-common/db.connect.1.svg, - src/plugins/grass/modules-common/db.connect.qgm, - src/plugins/grass/modules-common/db.connect.schema.qgm, - src/plugins/grass/modules-common/db.connect.which.qgm, - src/plugins/grass/modules-common/db.copy.1.svg, - src/plugins/grass/modules-common/db.copy.qgm, - src/plugins/grass/modules-common/db.execute.1.svg, - src/plugins/grass/modules-common/db.execute.qgm, - src/plugins/grass/modules-common/db.in.ogr.qgm, - src/plugins/grass/modules-common/db.login.1.svg, - src/plugins/grass/modules-common/db.login.qgm, - src/plugins/grass/modules-common/db.select.qgm, - src/plugins/grass/modules-common/g.manual.qgm, - src/plugins/grass/modules-common/g.proj.ascii.new.qgm, - src/plugins/grass/modules-common/g.proj.ascii.qgm, - src/plugins/grass/modules-common/g.proj.geo.new.qgm, - src/plugins/grass/modules-common/g.proj.geo.qgm, - src/plugins/grass/modules-common/g.proj.print.qgm, - src/plugins/grass/modules-common/g.proj.proj.new.qgm, - src/plugins/grass/modules-common/g.proj.proj.qgm, - src/plugins/grass/modules-common/g.proj.wkt.qgm, - src/plugins/grass/modules-common/g.region.multiple.raster.qgm, - src/plugins/grass/modules-common/g.region.multiple.vector.qgm, - src/plugins/grass/modules-common/g.region.save.qgm, - src/plugins/grass/modules-common/g.region.zoom.qgm, - src/plugins/grass/modules-common/g.transform.qgm, - src/plugins/grass/modules-common/i.fft.qgm, - src/plugins/grass/modules-common/i.fusion.brovey.qgm, - src/plugins/grass/modules-common/i.his.rgb.qgm, - src/plugins/grass/modules-common/i.ifft.qgm, - src/plugins/grass/modules-common/i.image.mosaic.qgm, - src/plugins/grass/modules-common/i.in.spotvgt.qgm, - src/plugins/grass/modules-common/i.landsat.rgb.qgm, - src/plugins/grass/modules-common/i.oif.qgm, - src/plugins/grass/modules-common/i.rgb.his.qgm, - src/plugins/grass/modules-common/i.tasscap4.qgm, - src/plugins/grass/modules-common/i.tasscap5.qgm, - src/plugins/grass/modules-common/i.tasscap7.qgm, - src/plugins/grass/modules-common/i.zc.qgm, - src/plugins/grass/modules-common/m.cogo.qgm, - src/plugins/grass/modules-common/m.proj.qgm, - src/plugins/grass/modules-common/nviz.qgm, - src/plugins/grass/modules-common/r.average.qgm, - src/plugins/grass/modules-common/r.basins.fill.qgm, - src/plugins/grass/modules-common/r.bitpattern.qgm, - src/plugins/grass/modules-common/r.blend.qgm, - src/plugins/grass/modules-common/r.buffer.1.svg, - src/plugins/grass/modules-common/r.buffer.2.svg, - src/plugins/grass/modules-common/r.buffer.qgm, - src/plugins/grass/modules-common/r.carve.qgm, - src/plugins/grass/modules-common/r.category.qgm, - src/plugins/grass/modules-common/r.circle.qgm, - src/plugins/grass/modules-common/r.clump.qgm, - src/plugins/grass/modules-common/r.coin.qgm, - src/plugins/grass/modules-common/r.colors.qgm, - src/plugins/grass/modules-common/r.colors.rast.qgm, - src/plugins/grass/modules-common/r.colors.rules.qgm, - src/plugins/grass/modules-common/r.colors.table.qgm, - src/plugins/grass/modules-common/r.composite.qgm, - src/plugins/grass/modules-common/r.compress.qgm, - src/plugins/grass/modules-common/r.contour.qgm, - src/plugins/grass/modules-common/r.contour2.qgm, - src/plugins/grass/modules-common/r.cost.coord.qgm, - src/plugins/grass/modules-common/r.cost.rast.qgm, - src/plugins/grass/modules-common/r.cost.vect.qgm, - src/plugins/grass/modules-common/r.covar.qgm, - src/plugins/grass/modules-common/r.cross.qgm, - src/plugins/grass/modules-common/r.describe.qgm, - src/plugins/grass/modules-common/r.distance.qgm, - src/plugins/grass/modules-common/r.drain.qgm, - src/plugins/grass/modules-common/r.fill.dir.qgm, - src/plugins/grass/modules-common/r.fillnulls.qgm, - src/plugins/grass/modules-common/r.grow.qgm, - src/plugins/grass/modules-common/r.his.qgm, - src/plugins/grass/modules-common/r.in.arc.qgm, - src/plugins/grass/modules-common/r.in.ascii.qgm, - src/plugins/grass/modules-common/r.in.aster.qgm, - src/plugins/grass/modules-common/r.in.bin.qgm, - src/plugins/grass/modules-common/r.in.gdal.loc.qgm, - src/plugins/grass/modules-common/r.in.gdal.qgis.loc.qgm, - src/plugins/grass/modules-common/r.in.gdal.qgis.qgm, - src/plugins/grass/modules-common/r.in.gdal.qgm, - src/plugins/grass/modules-common/r.in.gridatb.qgm, - src/plugins/grass/modules-common/r.in.mat.qgm, - src/plugins/grass/modules-common/r.in.poly.qgm, - src/plugins/grass/modules-common/r.in.srtm.qgm, - src/plugins/grass/modules-common/r.in.wms.qgm, - src/plugins/grass/modules-common/r.in.xyz.qgm, - src/plugins/grass/modules-common/r.kappa.qgm, - src/plugins/grass/modules-common/r.lake.qgm, - src/plugins/grass/modules-common/r.lake.seed.qgm, - src/plugins/grass/modules-common/r.lake.xy.qgm, - src/plugins/grass/modules-common/r.los.qgm, - src/plugins/grass/modules-common/r.mapcalc.qgm, - src/plugins/grass/modules-common/r.mapcalculator.qgm, - src/plugins/grass/modules-common/r.mask.qgm, - src/plugins/grass/modules-common/r.median.qgm, - src/plugins/grass/modules-common/r.mfilter.qgm, - src/plugins/grass/modules-common/r.mode.qgm, - src/plugins/grass/modules-common/r.neighbors.qgm, - src/plugins/grass/modules-common/r.null.null.qgm, - src/plugins/grass/modules-common/r.null.to.qgm, - src/plugins/grass/modules-common/r.null.val.qgm, - src/plugins/grass/modules-common/r.out.arc.qgm, - src/plugins/grass/modules-common/r.out.ascii.qgm, - src/plugins/grass/modules-common/r.out.bin.qgm, - src/plugins/grass/modules-common/r.out.gdal.gtiff.qgm, - src/plugins/grass/modules-common/r.out.gdal.qgm, - src/plugins/grass/modules-common/r.out.gridatb.qgm, - src/plugins/grass/modules-common/r.out.mat.qgm, - src/plugins/grass/modules-common/r.out.mpeg.qgm, - src/plugins/grass/modules-common/r.out.png.qgm, - src/plugins/grass/modules-common/r.out.pov.qgm, - src/plugins/grass/modules-common/r.out.ppm.qgm, - src/plugins/grass/modules-common/r.out.ppm3.qgm, - src/plugins/grass/modules-common/r.out.tiff.qgm, - src/plugins/grass/modules-common/r.out.vrml.qgm, - src/plugins/grass/modules-common/r.out.vtk.qgm, - src/plugins/grass/modules-common/r.out.xyz.qgm, - src/plugins/grass/modules-common/r.param.scale.qgm, - src/plugins/grass/modules-common/r.patch.qgm, - src/plugins/grass/modules-common/r.plane.qgm, - src/plugins/grass/modules-common/r.proj.qgm, - src/plugins/grass/modules-common/r.quant.qgm, - src/plugins/grass/modules-common/r.random.cells.qgm, - src/plugins/grass/modules-common/r.random.qgm, - src/plugins/grass/modules-common/r.reclass.area.greater.qgm, - src/plugins/grass/modules-common/r.reclass.area.lesser.qgm, - src/plugins/grass/modules-common/r.reclass.area.qgm, - src/plugins/grass/modules-common/r.reclass.file.qgm, - src/plugins/grass/modules-common/r.reclass.qgm, - src/plugins/grass/modules-common/r.recode.file.qgm, - src/plugins/grass/modules-common/r.recode.qgm, - src/plugins/grass/modules-common/r.region.alignTo.qgm, - src/plugins/grass/modules-common/r.region.edge.qgm, - src/plugins/grass/modules-common/r.region.qgm, - src/plugins/grass/modules-common/r.region.raster.qgm, - src/plugins/grass/modules-common/r.region.region.qgm, - src/plugins/grass/modules-common/r.region.vector.qgm, - src/plugins/grass/modules-common/r.regression.line.qgm, - src/plugins/grass/modules-common/r.report.qgm, - src/plugins/grass/modules-common/r.resamp.interp.qgm, - src/plugins/grass/modules-common/r.resamp.rst.qgm, - src/plugins/grass/modules-common/r.resamp.stats.qgm, - src/plugins/grass/modules-common/r.resample.qgm, - src/plugins/grass/modules-common/r.rescale.qgm, - src/plugins/grass/modules-common/r.series.qgm, - src/plugins/grass/modules-common/r.shaded.relief.qgm, - src/plugins/grass/modules-common/r.slope.aspect.aspect.qgm, - src/plugins/grass/modules-common/r.slope.aspect.slope.qgm, - src/plugins/grass/modules-common/r.statistics.qgm, - src/plugins/grass/modules-common/r.sum.qgm, - src/plugins/grass/modules-common/r.sunmask.date.time.qgm, - src/plugins/grass/modules-common/r.sunmask.position.qgm, - src/plugins/grass/modules-common/r.support.qgm, - src/plugins/grass/modules-common/r.support.stats.qgm, - src/plugins/grass/modules-common/r.surf.area.qgm, - src/plugins/grass/modules-common/r.surf.contour.qgm, - src/plugins/grass/modules-common/r.surf.gauss.qgm, - src/plugins/grass/modules-common/r.surf.idw.qgm, - src/plugins/grass/modules-common/r.surf.idw2.qgm, - src/plugins/grass/modules-common/r.surf.random.qgm, - src/plugins/grass/modules-common/r.texture.bis.qgm, - src/plugins/grass/modules-common/r.texture.qgm, - src/plugins/grass/modules-common/r.thin.qgm, - src/plugins/grass/modules-common/r.to.null.qgm, - src/plugins/grass/modules-common/r.to.vect.area.1.svg, - src/plugins/grass/modules-common/r.to.vect.area.2.svg, - src/plugins/grass/modules-common/r.to.vect.area.qgm, - src/plugins/grass/modules-common/r.to.vect.line.1.svg, - src/plugins/grass/modules-common/r.to.vect.line.2.svg, - src/plugins/grass/modules-common/r.to.vect.line.qgm, - src/plugins/grass/modules-common/r.to.vect.point.1.svg, - src/plugins/grass/modules-common/r.to.vect.point.qgm, - src/plugins/grass/modules-common/r.topidx.qgm, - src/plugins/grass/modules-common/r.transect.qgm, - src/plugins/grass/modules-common/r.univar.qgm, - src/plugins/grass/modules-common/r.volume.qgm, - src/plugins/grass/modules-common/r.walk.coord.qgm, - src/plugins/grass/modules-common/r.walk.vect.qgm, - src/plugins/grass/modules-common/r.water.outlet.qgm, - src/plugins/grass/modules-common/r.watershed.qgm, - src/plugins/grass/modules-common/r.what.qgm, - src/plugins/grass/modules-common/resize_grass, - src/plugins/grass/modules-common/shell.qgm, - src/plugins/grass/modules-common/v.build.all.qgm, - src/plugins/grass/modules-common/v.build.one.qgm, - src/plugins/grass/modules-common/v.build.polylines.qgm, - src/plugins/grass/modules-common/v.category.add.qgm, - src/plugins/grass/modules-common/v.category.change.qgm, - src/plugins/grass/modules-common/v.category.del.qgm, - src/plugins/grass/modules-common/v.category.sum.qgm, - src/plugins/grass/modules-common/v.centroids.qgm, - src/plugins/grass/modules-common/v.clean.bpol.qgm, - src/plugins/grass/modules-common/v.clean.break.qgm, - src/plugins/grass/modules-common/v.clean.chbridge.qgm, - src/plugins/grass/modules-common/v.clean.chdangles.qgm, - src/plugins/grass/modules-common/v.clean.prune.qgm, - src/plugins/grass/modules-common/v.clean.rmarea.qgm, - src/plugins/grass/modules-common/v.clean.rmbridge.qgm, - src/plugins/grass/modules-common/v.clean.rmdac.qgm, - src/plugins/grass/modules-common/v.clean.rmdangles.qgm, - src/plugins/grass/modules-common/v.clean.rmdupl.qgm, - src/plugins/grass/modules-common/v.clean.rmline.qgm, - src/plugins/grass/modules-common/v.clean.rmsa.qgm, - src/plugins/grass/modules-common/v.clean.snap.qgm, - src/plugins/grass/modules-common/v.db.addcol.qgm, - src/plugins/grass/modules-common/v.db.addtable.qgm, - src/plugins/grass/modules-common/v.db.connect.qgm, - src/plugins/grass/modules-common/v.db.droptable.qgm, - src/plugins/grass/modules-common/v.db.join.qgm, - src/plugins/grass/modules-common/v.db.reconnect.all.qgm, - src/plugins/grass/modules-common/v.db.renamecol.qgm, - src/plugins/grass/modules-common/v.db.sconnect.qgm, - src/plugins/grass/modules-common/v.db.univar.qgm, - src/plugins/grass/modules-common/v.db.update_const.qgm, - src/plugins/grass/modules-common/v.db.update_op.qgm, - src/plugins/grass/modules-common/v.db.update_op_query.qgm, - src/plugins/grass/modules-common/v.db.update_query.qgm, - src/plugins/grass/modules-common/v.db.what.connect.qgm, - src/plugins/grass/modules-common/v.delaunay.area.2.svg, - src/plugins/grass/modules-common/v.delaunay.area.qgm, - src/plugins/grass/modules-common/v.delaunay.line.2.svg, - src/plugins/grass/modules-common/v.delaunay.line.qgm, - src/plugins/grass/modules-common/v.dissolve.qgm, - src/plugins/grass/modules-common/v.distance.qgm, - src/plugins/grass/modules-common/v.drape.qgm, - src/plugins/grass/modules-common/v.extract.list.1.svg, - src/plugins/grass/modules-common/v.extract.list.2.svg, - src/plugins/grass/modules-common/v.extract.list.qgm, - src/plugins/grass/modules-common/v.extract.where.1.svg, - src/plugins/grass/modules-common/v.extract.where.2.svg, - src/plugins/grass/modules-common/v.extract.where.qgm, - src/plugins/grass/modules-common/v.generalize.1.svg, - src/plugins/grass/modules-common/v.generalize.qgm, - src/plugins/grass/modules-common/v.hull.2.svg, - src/plugins/grass/modules-common/v.hull.qgm, - src/plugins/grass/modules-common/v.in.ascii.qgm, - src/plugins/grass/modules-common/v.in.db.qgm, - src/plugins/grass/modules-common/v.in.dxf.1.svg, - src/plugins/grass/modules-common/v.in.dxf.multiple.qgm, - src/plugins/grass/modules-common/v.in.dxf.qgm, - src/plugins/grass/modules-common/v.in.e00.1.svg, - src/plugins/grass/modules-common/v.in.e00.qgm, - src/plugins/grass/modules-common/v.in.garmin.qgm, - src/plugins/grass/modules-common/v.in.gpsbabel.qgm, - src/plugins/grass/modules-common/v.in.mapgen.1.svg, - src/plugins/grass/modules-common/v.in.mapgen.qgm, - src/plugins/grass/modules-common/v.in.ogr.1.svg, - src/plugins/grass/modules-common/v.in.ogr.all.1.svg, - src/plugins/grass/modules-common/v.in.ogr.all.loc.1.svg, - src/plugins/grass/modules-common/v.in.ogr.all.loc.qgm, - src/plugins/grass/modules-common/v.in.ogr.all.qgm, - src/plugins/grass/modules-common/v.in.ogr.loc.1.svg, - src/plugins/grass/modules-common/v.in.ogr.loc.qgm, - src/plugins/grass/modules-common/v.in.ogr.qgis.1.svg, - src/plugins/grass/modules-common/v.in.ogr.qgis.loc.1.svg, - src/plugins/grass/modules-common/v.in.ogr.qgis.loc.qgm, - src/plugins/grass/modules-common/v.in.ogr.qgis.qgm, - src/plugins/grass/modules-common/v.in.ogr.qgm, - src/plugins/grass/modules-common/v.in.region.1.svg, - src/plugins/grass/modules-common/v.in.region.qgm, - src/plugins/grass/modules-common/v.kcv.qgm, - src/plugins/grass/modules-common/v.kernel.qgm, - src/plugins/grass/modules-common/v.mkgrid.region.1.svg, - src/plugins/grass/modules-common/v.mkgrid.region.qgm, - src/plugins/grass/modules-common/v.neighbors.qgm, - src/plugins/grass/modules-common/v.net.1.svg, - src/plugins/grass/modules-common/v.net.2.svg, - src/plugins/grass/modules-common/v.net.alloc.1.svg, - src/plugins/grass/modules-common/v.net.alloc.2.svg, - src/plugins/grass/modules-common/v.net.alloc.qgm, - src/plugins/grass/modules-common/v.net.iso.1.svg, - src/plugins/grass/modules-common/v.net.iso.2.svg, - src/plugins/grass/modules-common/v.net.iso.qgm, - src/plugins/grass/modules-common/v.net.nodes.1.svg, - src/plugins/grass/modules-common/v.net.nodes.2.svg, - src/plugins/grass/modules-common/v.net.nodes.qgm, - src/plugins/grass/modules-common/v.net.path.1.svg, - src/plugins/grass/modules-common/v.net.path.2.svg, - src/plugins/grass/modules-common/v.net.path.qgm, - src/plugins/grass/modules-common/v.net.qgm, - src/plugins/grass/modules-common/v.net.salesman.1.svg, - src/plugins/grass/modules-common/v.net.salesman.2.svg, - src/plugins/grass/modules-common/v.net.salesman.qgm, - src/plugins/grass/modules-common/v.net.steiner.1.svg, - src/plugins/grass/modules-common/v.net.steiner.2.svg, - src/plugins/grass/modules-common/v.net.steiner.qgm, - src/plugins/grass/modules-common/v.net.visibility.1.svg, - src/plugins/grass/modules-common/v.net.visibility.2.svg, - src/plugins/grass/modules-common/v.net.visibility.qgm, - src/plugins/grass/modules-common/v.normal.qgm, - src/plugins/grass/modules-common/v.out.ascii.qgm, - src/plugins/grass/modules-common/v.out.dxf.2.svg, - src/plugins/grass/modules-common/v.out.dxf.qgm, - src/plugins/grass/modules-common/v.out.ogr.2.svg, - src/plugins/grass/modules-common/v.out.ogr.gml.2.svg, - src/plugins/grass/modules-common/v.out.ogr.gml.qgm, - src/plugins/grass/modules-common/v.out.ogr.mapinfo.2.svg, - src/plugins/grass/modules-common/v.out.ogr.mapinfo.qgm, - src/plugins/grass/modules-common/v.out.ogr.qgm, - src/plugins/grass/modules-common/v.out.ogr.shape.2.svg, - src/plugins/grass/modules-common/v.out.ogr.shape.qgm, - src/plugins/grass/modules-common/v.out.pov.2.svg, - src/plugins/grass/modules-common/v.out.pov.qgm, - src/plugins/grass/modules-common/v.out.svg.2.svg, - src/plugins/grass/modules-common/v.out.svg.qgm, - src/plugins/grass/modules-common/v.out.vtk.2.svg, - src/plugins/grass/modules-common/v.out.vtk.qgm, - src/plugins/grass/modules-common/v.outlier.qgm, - src/plugins/grass/modules-common/v.overlay.and.1.svg, - src/plugins/grass/modules-common/v.overlay.and.2.svg, - src/plugins/grass/modules-common/v.overlay.and.3.svg, - src/plugins/grass/modules-common/v.overlay.and.qgm, - src/plugins/grass/modules-common/v.overlay.not.1.svg, - src/plugins/grass/modules-common/v.overlay.not.2.svg, - src/plugins/grass/modules-common/v.overlay.not.3.svg, - src/plugins/grass/modules-common/v.overlay.not.qgm, - src/plugins/grass/modules-common/v.overlay.or.1.svg, - src/plugins/grass/modules-common/v.overlay.or.2.svg, - src/plugins/grass/modules-common/v.overlay.or.3.svg, - src/plugins/grass/modules-common/v.overlay.or.qgm, - src/plugins/grass/modules-common/v.overlay.xor.1.svg, - src/plugins/grass/modules-common/v.overlay.xor.2.svg, - src/plugins/grass/modules-common/v.overlay.xor.3.svg, - src/plugins/grass/modules-common/v.overlay.xor.qgm, - src/plugins/grass/modules-common/v.parallel.qgm, - src/plugins/grass/modules-common/v.patch.qgm, - src/plugins/grass/modules-common/v.perturb.qgm, - src/plugins/grass/modules-common/v.proj.qgm, - src/plugins/grass/modules-common/v.random.qgm, - src/plugins/grass/modules-common/v.rast.stats.qgm, - src/plugins/grass/modules-common/v.reclass.attr.qgm, - src/plugins/grass/modules-common/v.reclass.file.qgm, - src/plugins/grass/modules-common/v.report.qgm, - src/plugins/grass/modules-common/v.sample.qgm, - src/plugins/grass/modules-common/v.segment.qgm, - src/plugins/grass/modules-common/v.select.overlap.1.svg, - src/plugins/grass/modules-common/v.select.overlap.2.svg, - src/plugins/grass/modules-common/v.select.overlap.3.svg, - src/plugins/grass/modules-common/v.select.overlap.qgm, - src/plugins/grass/modules-common/v.split.qgm, - src/plugins/grass/modules-common/v.support.1.svg, - src/plugins/grass/modules-common/v.support.qgm, - src/plugins/grass/modules-common/v.surf.bspline.qgm, - src/plugins/grass/modules-common/v.surf.idw.qgm, - src/plugins/grass/modules-common/v.surf.rst.qgm, - src/plugins/grass/modules-common/v.to.points.qgm, - src/plugins/grass/modules-common/v.to.rast.attr.qgm, - src/plugins/grass/modules-common/v.to.rast.constant.1.svg, - src/plugins/grass/modules-common/v.to.rast.constant.2.svg, - src/plugins/grass/modules-common/v.to.rast.constant.qgm, - src/plugins/grass/modules-common/v.transform.qgm, - src/plugins/grass/modules-common/v.type.bl.qgm, - src/plugins/grass/modules-common/v.type.cp.qgm, - src/plugins/grass/modules-common/v.type.lb.qgm, - src/plugins/grass/modules-common/v.type.pc.qgm, - src/plugins/grass/modules-common/v.univar.qgm, - src/plugins/grass/modules-common/v.voronoi.area.2.svg, - src/plugins/grass/modules-common/v.voronoi.area.qgm, - src/plugins/grass/modules-common/v.voronoi.line.2.svg, - src/plugins/grass/modules-common/v.voronoi.line.qgm, - src/plugins/grass/modules-common/v.what.rast.qgm, - src/plugins/grass/modules-common/v.what.vect.qgm, - src/plugins/grass/modules/CMakeLists.txt, - src/plugins/grass/modules/db-connect.1.svg, - src/plugins/grass/modules/db.connect-login.pg.qgm, - src/plugins/grass/modules/db.connect.1.svg, - src/plugins/grass/modules/db.connect.qgm, - src/plugins/grass/modules/db.connect.schema.qgm, - src/plugins/grass/modules/db.connect.which.qgm, - src/plugins/grass/modules/db.copy.1.svg, - src/plugins/grass/modules/db.copy.qgm, - src/plugins/grass/modules/db.execute.1.svg, - src/plugins/grass/modules/db.execute.qgm, - src/plugins/grass/modules/db.in.ogr.qgm, - src/plugins/grass/modules/db.login.1.svg, - src/plugins/grass/modules/db.login.qgm, - src/plugins/grass/modules/db.out.ogr.qgm, - src/plugins/grass/modules/db.select.qgm, - src/plugins/grass/modules/default.qgc, - src/plugins/grass/modules/g.manual.qgm, - src/plugins/grass/modules/g.proj.ascii.new.qgm, - src/plugins/grass/modules/g.proj.ascii.qgm, - src/plugins/grass/modules/g.proj.geo.new.qgm, - src/plugins/grass/modules/g.proj.geo.qgm, - src/plugins/grass/modules/g.proj.print.qgm, - src/plugins/grass/modules/g.proj.proj.new.qgm, - src/plugins/grass/modules/g.proj.proj.qgm, - src/plugins/grass/modules/g.proj.wkt.qgm, - src/plugins/grass/modules/g.region.multiple.raster.qgm, - src/plugins/grass/modules/g.region.multiple.vector.qgm, - src/plugins/grass/modules/g.region.save.qgm, - src/plugins/grass/modules/g.region.zoom.qgm, - src/plugins/grass/modules/g.transform.qgm, - src/plugins/grass/modules/i.fft.qgm, - src/plugins/grass/modules/i.fusion.brovey.qgm, - src/plugins/grass/modules/i.his.rgb.qgm, - src/plugins/grass/modules/i.ifft.qgm, - src/plugins/grass/modules/i.image.mosaic.qgm, - src/plugins/grass/modules/i.in.spotvgt.qgm, - src/plugins/grass/modules/i.landsat.rgb.qgm, - src/plugins/grass/modules/i.oif.qgm, - src/plugins/grass/modules/i.rgb.his.qgm, - src/plugins/grass/modules/i.tasscap4.qgm, - src/plugins/grass/modules/i.tasscap5.qgm, - src/plugins/grass/modules/i.tasscap7.qgm, - src/plugins/grass/modules/i.zc.qgm, - src/plugins/grass/modules/m.cogo.qgm, - src/plugins/grass/modules/m.proj.qgm, - src/plugins/grass/modules/nviz.qgm, - src/plugins/grass/modules/r.average.qgm, - src/plugins/grass/modules/r.basins.fill.qgm, - src/plugins/grass/modules/r.bilinear.qgm, - src/plugins/grass/modules/r.bitpattern.qgm, - src/plugins/grass/modules/r.blend.qgm, - src/plugins/grass/modules/r.buffer.1.svg, - src/plugins/grass/modules/r.buffer.2.svg, - src/plugins/grass/modules/r.buffer.qgm, - src/plugins/grass/modules/r.carve.qgm, - src/plugins/grass/modules/r.category.qgm, - src/plugins/grass/modules/r.circle.qgm, - src/plugins/grass/modules/r.clump.qgm, - src/plugins/grass/modules/r.coin.qgm, - src/plugins/grass/modules/r.colors.qgm, - src/plugins/grass/modules/r.colors.rast.qgm, - src/plugins/grass/modules/r.colors.rules.qgm, - src/plugins/grass/modules/r.colors.stddev.qgm, - src/plugins/grass/modules/r.colors.table.qgm, - src/plugins/grass/modules/r.composite.qgm, - src/plugins/grass/modules/r.compress.qgm, - src/plugins/grass/modules/r.contour.qgm, - src/plugins/grass/modules/r.contour2.qgm, - src/plugins/grass/modules/r.cost.coord.qgm, - src/plugins/grass/modules/r.cost.rast.qgm, - src/plugins/grass/modules/r.cost.vect.qgm, - src/plugins/grass/modules/r.covar.qgm, - src/plugins/grass/modules/r.cross.qgm, - src/plugins/grass/modules/r.describe.qgm, - src/plugins/grass/modules/r.distance.qgm, - src/plugins/grass/modules/r.drain.qgm, - src/plugins/grass/modules/r.external.all.qgm, - src/plugins/grass/modules/r.external.qgis.qgm, - src/plugins/grass/modules/r.external.qgm, - src/plugins/grass/modules/r.fill.dir.qgm, - src/plugins/grass/modules/r.fillnulls.qgm, - src/plugins/grass/modules/r.grow.distance.qgm, - src/plugins/grass/modules/r.grow.qgm, - src/plugins/grass/modules/r.his.qgm, - src/plugins/grass/modules/r.in.arc.qgm, - src/plugins/grass/modules/r.in.ascii.qgm, - src/plugins/grass/modules/r.in.aster.qgm, - src/plugins/grass/modules/r.in.bin.qgm, - src/plugins/grass/modules/r.in.gdal.loc.qgm, - src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm, - src/plugins/grass/modules/r.in.gdal.qgis.qgm, - src/plugins/grass/modules/r.in.gdal.qgm, - src/plugins/grass/modules/r.in.gridatb.qgm, - src/plugins/grass/modules/r.in.mat.qgm, - src/plugins/grass/modules/r.in.poly.qgm, - src/plugins/grass/modules/r.in.srtm.qgm, - src/plugins/grass/modules/r.in.wms.qgm, - src/plugins/grass/modules/r.in.xyz.qgm, - src/plugins/grass/modules/r.kappa.qgm, - src/plugins/grass/modules/r.lake.qgm, - src/plugins/grass/modules/r.lake.seed.qgm, - src/plugins/grass/modules/r.lake.xy.qgm, - src/plugins/grass/modules/r.los.qgm, - src/plugins/grass/modules/r.mapcalc.qgm, - src/plugins/grass/modules/r.mapcalculator.qgm, - src/plugins/grass/modules/r.mask.qgm, - src/plugins/grass/modules/r.median.qgm, - src/plugins/grass/modules/r.mfilter.qgm, - src/plugins/grass/modules/r.mode.qgm, - src/plugins/grass/modules/r.neighbors.qgm, - src/plugins/grass/modules/r.null.null.qgm, - src/plugins/grass/modules/r.null.to.qgm, - src/plugins/grass/modules/r.null.val.qgm, - src/plugins/grass/modules/r.out.arc.qgm, - src/plugins/grass/modules/r.out.ascii.qgm, - src/plugins/grass/modules/r.out.bin.qgm, - src/plugins/grass/modules/r.out.gdal.gtiff.qgm, - src/plugins/grass/modules/r.out.gdal.qgm, - src/plugins/grass/modules/r.out.gridatb.qgm, - src/plugins/grass/modules/r.out.mat.qgm, - src/plugins/grass/modules/r.out.mpeg.qgm, - src/plugins/grass/modules/r.out.png.qgm, - src/plugins/grass/modules/r.out.pov.qgm, - src/plugins/grass/modules/r.out.ppm.qgm, - src/plugins/grass/modules/r.out.ppm3.qgm, - src/plugins/grass/modules/r.out.tiff.qgm, - src/plugins/grass/modules/r.out.vrml.qgm, - src/plugins/grass/modules/r.out.vtk.qgm, - src/plugins/grass/modules/r.out.xyz.qgm, - src/plugins/grass/modules/r.param.scale.qgm, - src/plugins/grass/modules/r.patch.qgm, - src/plugins/grass/modules/r.plane.qgm, - src/plugins/grass/modules/r.proj.qgm, - src/plugins/grass/modules/r.quant.qgm, - src/plugins/grass/modules/r.random.cells.qgm, - src/plugins/grass/modules/r.random.qgm, - src/plugins/grass/modules/r.reclass.area.greater.qgm, - src/plugins/grass/modules/r.reclass.area.lesser.qgm, - src/plugins/grass/modules/r.reclass.area.qgm, - src/plugins/grass/modules/r.reclass.file.qgm, - src/plugins/grass/modules/r.reclass.qgm, - src/plugins/grass/modules/r.recode.file.qgm, - src/plugins/grass/modules/r.recode.qgm, - src/plugins/grass/modules/r.region.alignTo.qgm, - src/plugins/grass/modules/r.region.edge.qgm, - src/plugins/grass/modules/r.region.qgm, - src/plugins/grass/modules/r.region.raster.qgm, - src/plugins/grass/modules/r.region.region.qgm, - src/plugins/grass/modules/r.region.vector.qgm, - src/plugins/grass/modules/r.regression.line.qgm, - src/plugins/grass/modules/r.report.qgm, - src/plugins/grass/modules/r.resamp.interp.qgm, - src/plugins/grass/modules/r.resamp.rst.qgm, - src/plugins/grass/modules/r.resamp.stats.qgm, - src/plugins/grass/modules/r.resample.qgm, - src/plugins/grass/modules/r.rescale.qgm, - src/plugins/grass/modules/r.series.qgm, - src/plugins/grass/modules/r.shaded.relief.qgm, - src/plugins/grass/modules/r.slope.aspect.aspect.qgm, - src/plugins/grass/modules/r.slope.aspect.slope.qgm, - src/plugins/grass/modules/r.statistics.qgm, - src/plugins/grass/modules/r.sum.qgm, - src/plugins/grass/modules/r.sunmask.date.time.qgm, - src/plugins/grass/modules/r.sunmask.position.qgm, - src/plugins/grass/modules/r.support.qgm, - src/plugins/grass/modules/r.support.stats.qgm, - src/plugins/grass/modules/r.surf.area.qgm, - src/plugins/grass/modules/r.surf.contour.qgm, - src/plugins/grass/modules/r.surf.fractal.qgm, - src/plugins/grass/modules/r.surf.gauss.qgm, - src/plugins/grass/modules/r.surf.idw.qgm, - src/plugins/grass/modules/r.surf.idw2.qgm, - src/plugins/grass/modules/r.surf.random.qgm, - src/plugins/grass/modules/r.texture.bis.qgm, - src/plugins/grass/modules/r.texture.qgm, - src/plugins/grass/modules/r.thin.qgm, - src/plugins/grass/modules/r.to.null.qgm, - src/plugins/grass/modules/r.to.vect.area.1.svg, - src/plugins/grass/modules/r.to.vect.area.2.svg, - src/plugins/grass/modules/r.to.vect.area.qgm, - src/plugins/grass/modules/r.to.vect.line.1.svg, - src/plugins/grass/modules/r.to.vect.line.2.svg, - src/plugins/grass/modules/r.to.vect.line.qgm, - src/plugins/grass/modules/r.to.vect.point.1.svg, - src/plugins/grass/modules/r.to.vect.point.qgm, - src/plugins/grass/modules/r.topidx.qgm, - src/plugins/grass/modules/r.transect.qgm, - src/plugins/grass/modules/r.univar.qgm, - src/plugins/grass/modules/r.volume.qgm, - src/plugins/grass/modules/r.walk.coord.qgm, - src/plugins/grass/modules/r.walk.vect.qgm, - src/plugins/grass/modules/r.water.outlet.qgm, - src/plugins/grass/modules/r.watershed.qgm, - src/plugins/grass/modules/r.what.qgm, - src/plugins/grass/modules/resize_grass, - src/plugins/grass/modules/shell.qgm, - src/plugins/grass/modules/v.buffer.1.svg, - src/plugins/grass/modules/v.buffer.2.svg, - src/plugins/grass/modules/v.buffer.qgm, - src/plugins/grass/modules/v.build.all.qgm, - src/plugins/grass/modules/v.build.one.qgm, - src/plugins/grass/modules/v.build.polylines.qgm, - src/plugins/grass/modules/v.category.add.qgm, - src/plugins/grass/modules/v.category.change.qgm, - src/plugins/grass/modules/v.category.del.qgm, - src/plugins/grass/modules/v.category.sum.qgm, - src/plugins/grass/modules/v.centroids.qgm, - src/plugins/grass/modules/v.clean.bpol.qgm, - src/plugins/grass/modules/v.clean.break.qgm, - src/plugins/grass/modules/v.clean.chbridge.qgm, - src/plugins/grass/modules/v.clean.chdangles.qgm, - src/plugins/grass/modules/v.clean.prune.qgm, - src/plugins/grass/modules/v.clean.rmarea.qgm, - src/plugins/grass/modules/v.clean.rmbridge.qgm, - src/plugins/grass/modules/v.clean.rmdac.qgm, - src/plugins/grass/modules/v.clean.rmdangles.qgm, - src/plugins/grass/modules/v.clean.rmdupl.qgm, - src/plugins/grass/modules/v.clean.rmline.qgm, - src/plugins/grass/modules/v.clean.rmsa.qgm, - src/plugins/grass/modules/v.clean.snap.qgm, - src/plugins/grass/modules/v.db.addcol.qgm, - src/plugins/grass/modules/v.db.addtable.qgm, - src/plugins/grass/modules/v.db.connect.qgm, - src/plugins/grass/modules/v.db.dropcol.qgm, - src/plugins/grass/modules/v.db.droptable.qgm, - src/plugins/grass/modules/v.db.join.qgm, - src/plugins/grass/modules/v.db.reconnect.all.qgm, - src/plugins/grass/modules/v.db.renamecol.qgm, - src/plugins/grass/modules/v.db.sconnect.qgm, - src/plugins/grass/modules/v.db.select.qgm, - src/plugins/grass/modules/v.db.select.where.qgm, - src/plugins/grass/modules/v.db.univar.qgm, - src/plugins/grass/modules/v.db.update_const.qgm, - src/plugins/grass/modules/v.db.update_op.qgm, - src/plugins/grass/modules/v.db.update_op_query.qgm, - src/plugins/grass/modules/v.db.update_query.qgm, - src/plugins/grass/modules/v.db.what.connect.qgm, - src/plugins/grass/modules/v.delaunay.area.2.svg, - src/plugins/grass/modules/v.delaunay.area.qgm, - src/plugins/grass/modules/v.delaunay.line.2.svg, - src/plugins/grass/modules/v.delaunay.line.qgm, - src/plugins/grass/modules/v.dissolve.qgm, - src/plugins/grass/modules/v.distance.qgm, - src/plugins/grass/modules/v.drape.qgm, - src/plugins/grass/modules/v.extract.list.1.svg, - src/plugins/grass/modules/v.extract.list.2.svg, - src/plugins/grass/modules/v.extract.list.qgm, - src/plugins/grass/modules/v.extract.where.1.svg, - src/plugins/grass/modules/v.extract.where.2.svg, - src/plugins/grass/modules/v.extract.where.qgm, - src/plugins/grass/modules/v.generalize.1.svg, - src/plugins/grass/modules/v.generalize.qgm, - src/plugins/grass/modules/v.hull.2.svg, - src/plugins/grass/modules/v.hull.qgm, - src/plugins/grass/modules/v.in.ascii.qgm, - src/plugins/grass/modules/v.in.db.qgm, - src/plugins/grass/modules/v.in.dxf.1.svg, - src/plugins/grass/modules/v.in.dxf.multiple.qgm, - src/plugins/grass/modules/v.in.dxf.qgm, - src/plugins/grass/modules/v.in.e00.1.svg, - src/plugins/grass/modules/v.in.e00.qgm, - src/plugins/grass/modules/v.in.garmin.qgm, - src/plugins/grass/modules/v.in.geonames.1.svg, - src/plugins/grass/modules/v.in.geonames.qgm, - src/plugins/grass/modules/v.in.gns.qgm, - src/plugins/grass/modules/v.in.gpsbabel.qgm, - src/plugins/grass/modules/v.in.mapgen.1.svg, - src/plugins/grass/modules/v.in.mapgen.qgm, - src/plugins/grass/modules/v.in.ogr.1.svg, - src/plugins/grass/modules/v.in.ogr.all.1.svg, - src/plugins/grass/modules/v.in.ogr.all.loc.1.svg, - src/plugins/grass/modules/v.in.ogr.all.loc.qgm, - src/plugins/grass/modules/v.in.ogr.all.qgm, - src/plugins/grass/modules/v.in.ogr.loc.1.svg, - src/plugins/grass/modules/v.in.ogr.loc.qgm, - src/plugins/grass/modules/v.in.ogr.qgis.1.svg, - src/plugins/grass/modules/v.in.ogr.qgis.loc.1.svg, - src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm, - src/plugins/grass/modules/v.in.ogr.qgis.qgm, - src/plugins/grass/modules/v.in.ogr.qgm, - src/plugins/grass/modules/v.in.region.1.svg, - src/plugins/grass/modules/v.in.region.qgm, - src/plugins/grass/modules/v.kcv.qgm, - src/plugins/grass/modules/v.kernel.qgm, - src/plugins/grass/modules/v.mkgrid.region.1.svg, - src/plugins/grass/modules/v.mkgrid.region.qgm, - src/plugins/grass/modules/v.neighbors.qgm, - src/plugins/grass/modules/v.net.1.svg, - src/plugins/grass/modules/v.net.2.svg, - src/plugins/grass/modules/v.net.alloc.1.svg, - src/plugins/grass/modules/v.net.alloc.2.svg, - src/plugins/grass/modules/v.net.alloc.qgm, - src/plugins/grass/modules/v.net.iso.1.svg, - src/plugins/grass/modules/v.net.iso.2.svg, - src/plugins/grass/modules/v.net.iso.qgm, - src/plugins/grass/modules/v.net.nodes.1.svg, - src/plugins/grass/modules/v.net.nodes.2.svg, - src/plugins/grass/modules/v.net.nodes.qgm, - src/plugins/grass/modules/v.net.path.1.svg, - src/plugins/grass/modules/v.net.path.2.svg, - src/plugins/grass/modules/v.net.path.qgm, - src/plugins/grass/modules/v.net.qgm, - src/plugins/grass/modules/v.net.salesman.1.svg, - src/plugins/grass/modules/v.net.salesman.2.svg, - src/plugins/grass/modules/v.net.salesman.qgm, - src/plugins/grass/modules/v.net.steiner.1.svg, - src/plugins/grass/modules/v.net.steiner.2.svg, - src/plugins/grass/modules/v.net.steiner.qgm, - src/plugins/grass/modules/v.net.visibility.1.svg, - src/plugins/grass/modules/v.net.visibility.2.svg, - src/plugins/grass/modules/v.net.visibility.qgm, - src/plugins/grass/modules/v.normal.qgm, - src/plugins/grass/modules/v.out.ascii.qgm, - src/plugins/grass/modules/v.out.dxf.2.svg, - src/plugins/grass/modules/v.out.dxf.qgm, - src/plugins/grass/modules/v.out.ogr.2.svg, - src/plugins/grass/modules/v.out.ogr.gml.2.svg, - src/plugins/grass/modules/v.out.ogr.gml.qgm, - src/plugins/grass/modules/v.out.ogr.mapinfo.2.svg, - src/plugins/grass/modules/v.out.ogr.mapinfo.qgm, - src/plugins/grass/modules/v.out.ogr.pg.qgm, - src/plugins/grass/modules/v.out.ogr.qgm, - src/plugins/grass/modules/v.out.ogr.shape.2.svg, - src/plugins/grass/modules/v.out.ogr.shape.qgm, - src/plugins/grass/modules/v.out.pov.2.svg, - src/plugins/grass/modules/v.out.pov.qgm, - src/plugins/grass/modules/v.out.svg.2.svg, - src/plugins/grass/modules/v.out.svg.qgm, - src/plugins/grass/modules/v.out.vtk.2.svg, - src/plugins/grass/modules/v.out.vtk.qgm, - src/plugins/grass/modules/v.outlier.qgm, - src/plugins/grass/modules/v.overlay.and.1.svg, - src/plugins/grass/modules/v.overlay.and.2.svg, - src/plugins/grass/modules/v.overlay.and.3.svg, - src/plugins/grass/modules/v.overlay.and.qgm, - src/plugins/grass/modules/v.overlay.not.1.svg, - src/plugins/grass/modules/v.overlay.not.2.svg, - src/plugins/grass/modules/v.overlay.not.3.svg, - src/plugins/grass/modules/v.overlay.not.qgm, - src/plugins/grass/modules/v.overlay.or.1.svg, - src/plugins/grass/modules/v.overlay.or.2.svg, - src/plugins/grass/modules/v.overlay.or.3.svg, - src/plugins/grass/modules/v.overlay.or.qgm, - src/plugins/grass/modules/v.overlay.xor.1.svg, - src/plugins/grass/modules/v.overlay.xor.2.svg, - src/plugins/grass/modules/v.overlay.xor.3.svg, - src/plugins/grass/modules/v.overlay.xor.qgm, - src/plugins/grass/modules/v.parallel.qgm, - src/plugins/grass/modules/v.patch.qgm, - src/plugins/grass/modules/v.perturb.qgm, - src/plugins/grass/modules/v.proj.qgm, - src/plugins/grass/modules/v.random.qgm, - src/plugins/grass/modules/v.rast.stats.qgm, - src/plugins/grass/modules/v.reclass.attr.qgm, - src/plugins/grass/modules/v.reclass.file.qgm, - src/plugins/grass/modules/v.report.qgm, - src/plugins/grass/modules/v.sample.qgm, - src/plugins/grass/modules/v.segment.qgm, - src/plugins/grass/modules/v.select.overlap.1.svg, - src/plugins/grass/modules/v.select.overlap.2.svg, - src/plugins/grass/modules/v.select.overlap.3.svg, - src/plugins/grass/modules/v.select.overlap.qgm, - src/plugins/grass/modules/v.split.qgm, - src/plugins/grass/modules/v.support.1.svg, - src/plugins/grass/modules/v.support.qgm, - src/plugins/grass/modules/v.surf.bspline.qgm, - src/plugins/grass/modules/v.surf.idw.qgm, - src/plugins/grass/modules/v.surf.rst.qgm, - src/plugins/grass/modules/v.to.db.qgm, - src/plugins/grass/modules/v.to.points.qgm, - src/plugins/grass/modules/v.to.rast.attr.qgm, - src/plugins/grass/modules/v.to.rast.constant.1.svg, - src/plugins/grass/modules/v.to.rast.constant.2.svg, - src/plugins/grass/modules/v.to.rast.constant.qgm, - src/plugins/grass/modules/v.transform.qgm, - src/plugins/grass/modules/v.type.bl.qgm, - src/plugins/grass/modules/v.type.cp.qgm, - src/plugins/grass/modules/v.type.lb.qgm, - src/plugins/grass/modules/v.type.pc.qgm, - src/plugins/grass/modules/v.univar.qgm, - src/plugins/grass/modules/v.voronoi.area.2.svg, - src/plugins/grass/modules/v.voronoi.area.qgm, - src/plugins/grass/modules/v.voronoi.line.2.svg, - src/plugins/grass/modules/v.voronoi.line.qgm, - src/plugins/grass/modules/v.what.rast.qgm, - src/plugins/grass/modules/v.what.vect.qgm: GRASS version support - -2011-11-07 Nathan Woodrow - - * resources/CMakeLists.txt, resources/function_help/CMakeLists.txt, - resources/function_help/length-en_US, - resources/function_help/lower-en_US, - resources/function_help/replace-en_US, - resources/function_help/substr-en_US, - resources/function_help/template, - resources/function_help/upper-en_US, src/core/qgsexpression.cpp, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h, - src/ui/qgsexpressionbuilder.ui: Handle function help the same way as - context help; Allows easier management of help; Use same style sheet - as context help. - -2011-11-07 Juergen E. Fischer - - * src/analysis/CMakeLists.txt, src/analysis/network/CMakeLists.txt, - src/app/composer/qgscomposertablewidget.cpp, - src/core/CMakeLists.txt, src/plugins/roadgraph/CMakeLists.txt, - src/plugins/spatialquery/CMakeLists.txt, - src/providers/memory/CMakeLists.txt, - src/providers/spatialite/qgsspatialiteconnection.cpp, - src/providers/wfs/CMakeLists.txt: remove spatialindex include - -2011-11-06 William Kyngesburye - - * INSTALL, doc/INSTALL.html, doc/osx.t2t: OS X build/install updates - -2011-11-06 William Kyngesburye - - * src/plugins/grass/CMakeLists.txt, - src/providers/grass/CMakeLists.txt: fix for #3999 until something - better can be done - -2011-11-06 William Kyngesburye - - * src/analysis/network/CMakeLists.txt: frameworkize networkanalysis - on OS X - -2011-11-06 William Kyngesburye + german translation update - * mac/cmake/1qt.cmake.in: missed a bit for bundling qsqlite +Juergen E. Fischer 2013-06-08 -2011-11-06 William Kyngesburye + postgresql & oracle provider fixes: + - start with an empty line edit when entering srids (fixes #8016) + - oracle provider: order primary key candidates in views by column id (fixes #8018) + - disable non-selectable entries and provide tooltips on why they are disabled - * mac/cmake/1qt.cmake.in: bundle qsqlite for eVis plugin; bundle - other Qt frameworks for extra plugins +Victor Olaya 2013-06-08 -2011-11-06 William Kyngesburye + [sextante] fixed issue with multiple raster input in gdal merge - * src/core/CMakeLists.txt: fix missing spatialindex include dir +Radim Blazek 2013-06-07 -2011-11-05 marco + increased raster DEM maximum exaggeration limit, fixes #7599 - * src/app/composer/qgscomposertablewidget.cpp, - src/app/composer/qgscomposertablewidget.h: Refresh map list in - composer table widget in showEvent. Ticket #4496 +Radim Blazek 2013-06-07 -2011-11-04 Martin Dobias + reset brush before raster layer draw, fixes #7766 - * src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp: Fix #4495 - - patch by Nathan +D'Hont René-Luc 2013-06-07 -2011-11-04 Werner Macho + Update QGIS Server OWS Capabilities + + Has OWS capabilities and context validated for metadata - * : Merge pull request #55 from mach0/master german typo fixes +Radim Blazek 2013-06-07 -2011-11-04 Werner Macho + Force GRASS shell font by setStyleSheet, hopefully fixes #7340; added black on white scheme - * i18n/qgis_de.ts: translation update: small german typo fixes +Marco Hugentobler 2013-06-07 -2011-11-03 Juergen E. Fischer + Keep zoom level constant if zooming to one selected point - * src/core/qgsexpression.cpp, src/core/qgspallabeling.cpp: fix NULL - support in expression evaluation +Radim Blazek 2013-06-07 -2011-11-03 Martin Dobias + placeholderText requires Qt 4.7 - * src/gui/symbology-ng/qgscolorrampcombobox.cpp: Fix #4479 - trigger - "new color ramp" always when activated +Radim Blazek 2013-06-07 -2011-11-03 Juergen E. Fischer + ogr debug fix - * src/providers/spatialite/CMakeLists.txt: fix windows build +Matthias Kuhn 2013-06-07 -2011-11-02 Martin Dobias + [diagrams] Fix scaling and positioning of histograms - * resources/symbology-ng-style.xml: Add default gradient ColorBrewer - color ramps from Anita +Matthias Kuhn 2013-06-07 -2011-11-02 Martin Dobias + Fix crash when selecting invalid CRS in new spatialite dialog - * : Merge pull request #54 from NathanW2/expression-ui Remove multiline label option and make it default and expression - builder UI tweaks. +Nathan Woodrow 2013-06-07 -2011-11-02 Martin Dobias + Fix canvas refresh on layer load - * src/core/qgsexpression.h, tests/src/core/testqgsexpression.cpp: - Fix #4441 +Matthias Kuhn 2013-06-07 -2011-11-02 Nathan Woodrow + [diagrams] Diagram fixes and UI improvements (Fix #7960) + * Use correct color for pie chart if only one value is >0 + * Show default text in scaling text box - * src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp, - src/ui/qgslabelingguibase.ui: Remove option for multiline; Code - always uses multiline; Direction symbol now works for multiline +Borys Jurgiel 2013-06-06 -2011-11-01 Nathan Woodrow + [Plugin Manager] Better cope with broken plugins - * src/gui/qgsexpressionbuilderwidget.cpp, - src/ui/qgsexpressionbuilder.ui: Added icons for save and load - buttons; Open and Save buttons hiden for now +Juergen E. Fischer 2013-06-06 -2011-11-02 Marco Hugentobler + translation update: + - update_ts_files.sh: add -f flag ('fast' mode; only update specified languages + and don't run tsstat.pl) + - tsstat.pl: cut off latin1 & cyrillic suffix and use only one serbian flag + - unify flag image permission + - german translation update - * : [FEATURE]: added vector field symbol layer to visualise - displacement. Changed ellipse symbol layer to resolve field indices - in startRender method +Juergen E. Fischer 2013-06-06 -2011-11-01 Marco Hugentobler + fix activateDeactivateLayerRelatedActions (fixes #8005) - * src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp, - src/ui/symbollayer/widget_vectorfield.ui: Improve vector field - widget +Victor Olaya 2013-06-06 -2011-11-01 Marco Hugentobler + [sextante] fixed delete duplicated geoms algorithm - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp, - src/core/symbology-ng/qgsvectorfieldsymbollayer.h: Handle different - vector field types +Victor Olaya 2013-06-06 -2011-11-01 Marco Hugentobler + [sextante] updated link to sextante chapter in error messages - * src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.h, - src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp: Cleanup - ellipse symbol layer to store only field names, not indices +Victor Olaya 2013-06-06 -2011-11-01 Marco Hugentobler + [sextante] fixed idle progress bar in execution dialog - * src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Fix - stopRender call in graduated symbol renderer +Victor Olaya 2013-06-06 -2011-11-01 Marco Hugentobler + [sextante]added checking for R installation - * src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp: Added vlayer in - startRender calls of renderer classes +Larry Shaffer 2013-05-26 -2011-11-01 Marco Hugentobler + Revert target hyphen change (update ADD_SIP_PYTHON_MODULE macro first) - * python/core/symbology-ng-core.sip, - src/core/symbology-ng/qgsvectorfieldsymbollayer.h, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h: Updated - python bindings, added export macros +Juergen E. Fischer 2013-06-06 -2011-10-31 Nathan Woodrow + german translation update - * src/ui/qgsexpressionbuilder.ui: Move help above field values, less - movement in Ui for user;add save and open button +Juergen E. Fischer 2013-06-06 -2011-10-31 Tim Sutton + include python parts of plugin installer in ts files and a translation string fix - * : commit e9ee865f78aae8ceb7b8a7a20d43abdcbc429327 Author: Tim - Sutton Date: Mon Oct 31 23:24:45 2011 +0200 +Victor Olaya 2013-06-06 -2011-10-31 Tim Sutton + [sextante] improvements in batch processing interface - * : commit 50f20c2c20e39c33ba72bd72d370acdcffeb9d67 Author: Martin - Dobias Date: Mon Oct 31 11:48:24 2011 -0300 +Victor Olaya 2013-06-06 -2011-10-31 Martin Dobias + [sextante] fixed issue with blank spaces in filenames in OTB - * src/python/qgspythonutilsimpl.cpp: Fix #4444. Patch by Vaclav - Petras +Merge: c8ff386 4d72f82 +Matthias Kuhn 2013-06-06 -2011-10-31 Martin Dobias + Merge pull request #638 from 3nids/typo + + typo - * : Merge pull request #53 from NathanW2/expression-labels-patch Expression label patches +Denis Rouzaud 2013-06-06 -2011-10-22 Martin Dobias + typo - * src/app/CMakeLists.txt, src/app/qgisapp.cpp, - src/app/spatialite/qgsspatialitesourceselect.cpp, - src/app/spatialite/qgsspatialitesourceselect.h, - src/app/spatialite/qgsspatialitetablemodel.cpp, - src/app/spatialite/qgsspatialitetablemodel.h, - src/core/qgsdataitem.h, src/providers/spatialite/CMakeLists.txt, - src/providers/spatialite/qgsspatialiteconnection.cpp, - src/providers/spatialite/qgsspatialiteconnection.h, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitesourceselect.cpp, - src/providers/spatialite/qgsspatialitesourceselect.h, - src/providers/spatialite/qgsspatialitetablemodel.cpp, - src/providers/spatialite/qgsspatialitetablemodel.h: Move SpatiaLite - source select dialog to provider. +Radim Blazek 2013-06-06 -2011-10-22 Martin Dobias + ogr virtual layers mix single and multi types in sublayers, fixed feature count, fixes #8001 - * src/providers/spatialite/CMakeLists.txt, - src/providers/spatialite/qgsspatialiteconnection.cpp, - src/providers/spatialite/qgsspatialiteconnection.h, - src/providers/spatialite/qgsspatialitedataitems.cpp, - src/providers/spatialite/qgsspatialitedataitems.h: [FEATURE] - SpatiaLite databases in browser +Matthias Kuhn 2013-06-06 -2011-10-30 marco + Don't pile derived attributes (Fix #7850) - * src/core/symbology-ng/qgssinglesymbolrendererv2.cpp, - src/core/symbology-ng/qgssymbolv2.cpp, - src/core/symbology-ng/qgssymbolv2.h, - src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp, - src/core/symbology-ng/qgsvectorfieldsymbollayer.h, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp: Optionally - pass vector layer pointer to rendercontext +Werner Macho 2013-06-06 -2011-10-28 Nathan Woodrow + translation update: farsi - * src/core/qgspallabeling.cpp: Fix multiline overlap - Fix for #4454 +Merge: 9a7776a e49783d +Werner Macho 2013-06-05 -2011-10-29 Juergen E. Fischer + Merge pull request #637 from qgis-jp/for_pull_from_ja + + update GUI translation ja with Minoru Akagi - * src/core/symbology-ng/qgspointdisplacementrenderer.h, - src/gui/symbology-ng/qgspointdisplacementrendererwidget.h: fix - windows build +Nyall Dawson 2013-06-06 -2011-10-29 Nathan Woodrow + Fix #7973 Move print as raster and resolution spin box to "paper and quality" group box, don't disable resolution spin box when print as raster is unchecked. - * src/core/qgspallabeling.cpp: Remove debug noise for expression - labels +yoichigmf 2013-06-06 -2011-10-28 Tim Sutton + update GUI translation ja with Minoru Akagi - * : commit 05e3258ce854fede0c85b1d2d304cfb03ddfba85 Author: Juergen - E. Fischer Date: Fri Oct 28 08:53:42 2011 +0200 +Nathan Woodrow 2013-06-06 -2011-10-28 Marco Hugentobler - - * src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp, - src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h, - src/gui/symbology-ng/qgsvectorfieldwidget.h: Added vectorfield - widgets - -2011-10-28 Nathan Woodrow - - * src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h: Fix grabbing of first - QgsFeature; Cache QgsFeature being used to eval; Handle layers with - no objects - -2011-10-27 Juergen E. Fischer - - * src/core/qgscoordinatereferencesystem.cpp: For EPSG initialize - GDAL CRS from authid instead of proj.4 string - -2011-10-27 Juergen E. Fischer - - * src/core/qgsscalecalculator.cpp, - src/providers/postgres/qgspostgresprovider.cpp: reduce debugging - noise - -2011-10-27 Nathan Woodrow - - * src/core/qgspallabeling.cpp: Enable multiline labels by default - -2011-10-27 Marco Hugentobler - - * src/core/CMakeLists.txt, - src/core/symbology-ng/qgspointdisplacementrenderer.cpp, - src/core/symbology-ng/qgspointdisplacementrenderer.h, - src/core/symbology-ng/qgsrendererv2registry.cpp, - src/gui/CMakeLists.txt, - src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp, - src/gui/symbology-ng/qgspointdisplacementrendererwidget.h, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/plugins/CMakeLists.txt, - src/plugins/point_displacement_renderer/CMakeLists.txt, - src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp, - src/plugins/point_displacement_renderer/qgsdisplacementplugin.h, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - r.cpp, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - r.h, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - rwidget.cpp, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - rwidget.h, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - rwidgetbase.ui, src/ui/qgspointdisplacementrendererwidgetbase.ui: - Move point displacement renderer from plugin to main application - -2011-10-26 Marco Hugentobler - - * src/core/CMakeLists.txt, - src/core/symbology-ng/qgssymbollayerv2registry.cpp, - src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp, - src/core/symbology-ng/qgsvectorfieldsymbollayer.h, - src/gui/CMakeLists.txt, - src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp, - src/ui/symbollayer/widget_vectorfield.ui: Added vector field symbol - layer and widget - -2011-10-25 Marco Hugentobler - - * src/app/qgisapp.cpp, src/app/qgsoptions.cpp, - src/plugins/georeferencer/qgsopenrasterdialog.cpp: Set prompt as - default behaviour for unknown CRS - -2011-10-24 Tim Sutton - - * : commit 1a1f5ebe30889897d020c47e3a29b6c0ad9a67dc Author: Juergen - E. Fischer Date: Wed Oct 19 18:20:29 2011 +0200 - -2011-10-22 Juergen E. Fischer - - * src/analysis/interpolation/qgsgridfilewriter.cpp, - src/analysis/raster/qgsaspectfilter.h, - src/analysis/raster/qgsderivativefilter.cpp, - src/analysis/raster/qgsderivativefilter.h, - src/analysis/raster/qgsninecellfilter.cpp, - src/analysis/raster/qgsninecellfilter.h, - src/analysis/raster/qgsruggednessfilter.cpp, - src/analysis/raster/qgsruggednessfilter.h, - src/analysis/raster/qgsslopefilter.cpp, - src/analysis/raster/qgsslopefilter.h, - src/analysis/raster/qgstotalcurvaturefilter.cpp, - src/analysis/raster/qgstotalcurvaturefilter.h, - src/analysis/vector/qgsoverlayanalyzer.h, - src/analysis/vector/qgszonalstatistics.h, - src/app/composer/qgscomposermanager.h, src/app/qgisapp.cpp, - src/app/qgsdecorationscalebardialog.cpp, - src/app/qgsfieldcalculator.cpp, - src/app/qgsformannotationdialog.cpp, - src/app/qgsmaptooladdvertex.cpp, - src/app/qgsmaptoolrotatepointsymbols.h, - src/app/qgspointrotationitem.h, - src/core/composer/qgscomposerarrow.cpp, - src/core/composer/qgscomposerattributetable.cpp, - src/core/composer/qgscomposeritem.h, - src/core/composer/qgscomposerlabel.cpp, - src/core/composer/qgscomposermap.cpp, - src/core/composer/qgscomposerpicture.cpp, - src/core/composer/qgscomposertable.cpp, - src/core/composer/qgscomposertable.h, src/core/qgsexpression.cpp, - src/core/qgsgeometry.cpp, src/core/qgsgeometry.h, - src/core/qgspalgeometry.h, src/core/qgspallabeling.cpp, - src/core/qgspallabeling.h, src/gui/qgsannotationitem.cpp, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsformannotationitem.cpp, src/mapserver/qgis_map_serv.cpp, - src/mapserver/qgscomparisonfilter.h, - src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h, - src/mapserver/qgshttprequesthandler.cpp, - src/mapserver/qgsmslayerbuilder.h, src/mapserver/qgssldrule.h, - src/mapserver/qgswmsserver.h, - src/plugins/diagram_overlay/qgsbardiagramfactory.h, - src/plugins/diagram_overlay/qgsdiagramfactory.h, - src/plugins/diagram_overlay/qgsdiagramrenderer.h, - src/plugins/diagram_overlay/qgssvgdiagramfactory.h, - src/plugins/georeferencer/qgsgcpcanvasitem.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.cpp, - src/plugins/georeferencer/qgsgeoreftransform.cpp, - src/plugins/georeferencer/qgsresidualplotitem.h, - src/plugins/globe/globe_plugin.cpp, - src/plugins/globe/globe_plugin_dialog.h, - src/plugins/globe/qgsosgearthtilesource.cpp, - src/plugins/grass/qgsgrassselect.cpp, - src/plugins/interpolation/qgsinterpolationdialog.cpp, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - r.cpp, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - r.h, - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - rwidget.cpp, src/providers/wfs/qgswfsdata.h, - src/providers/wfs/qgswfsprovider.cpp: more cosmetics - -2011-10-22 Juergen E. Fischer - - * i18n/qgis_de.ts: german translation update - -2011-10-22 Sandro Santilli - - * src/core/pal/feature.cpp: Label direction symbol shouldn't depend - on "map" vs. "line" orientation. Refer to issue #3643 for further - discussion - -2011-10-22 Juergen E. Fischer - - * src/analysis/interpolation/DualEdgeTriangulation.cc, - src/core/qgslabel.cpp, src/gui/CMakeLists.txt, - src/gui/qgsexpressionbuilderwidget.cpp, - src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp, - src/plugins/globe/globe_plugin.cpp, - src/plugins/grass/qgsgrassbrowser.cpp, - src/plugins/grass/qgsgrassshell.cpp, - src/plugins/roadgraph/shortestpathwidget.cpp, - src/providers/ogr/qgsogrprovider.cpp, src/ui/qgsoptionsbase.ui, - src/ui/qgsvectorlayerpropertiesbase.ui: fix warnings and more - cosmetics - -2011-10-22 Sandro Santilli - - * tests/src/core/testqgsexpression.cpp: Only implement QVariant bug - workaround when building against Qt < 4.7.1 [#4284] - -2011-10-22 Sandro Santilli - - * tests/src/core/testqgsexpression.cpp: Workaround for builds - against Qt 4.6.2. Fixes bug #4284. - -2011-10-22 marco - - * src/app/composer/qgscomposerarrowwidget.cpp, - src/app/composer/qgscomposerarrowwidget.h: Fix for ticket #4414 (svg - indicators for arrows are not shown) - -2011-10-21 Martin Dobias - - * src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: [FEATURE] Delete fields in - shapefiles (finally!) This is currently supported only by development versions of - GDAL/OGR. GDAL 1.8.x does _not_ support this feature. - -2011-10-21 Martin Dobias - - * src/gui/CMakeLists.txt: Fix install - -2011-10-21 Martin Dobias - - * src/app/qgsvectorlayerproperties.cpp, - src/core/qgsvectordataprovider.h, - src/providers/ogr/qgsogrprovider.cpp, - src/ui/qgsvectorlayerpropertiesbase.ui: Allow setting I/O encoding - for OGR layers in vector layer properties. Until now this was only possible to set when opening files with - QgsEncodingFileDialog. Layers opened from browser were opened - always with default encoding and no way to change it. The newly created "provider-specific" option group may be used by - other providers for some custom actions ("create spatial index" - should move here, too) + Only refresh canvas when needed on drop event -2011-10-21 Martin Dobias +Merge: c1fb1bb 74b18e5 +Nathan Woodrow 2013-06-05 - * : commit bd5a31b51e7a4e70960b8f25f74d90f48537d97b Author: Martin - Dobias Date: Fri Oct 21 12:02:38 2011 -0300 + Merge pull request #636 from vinayan/zoomlayerextent + + [Fix #7333] - Zoom to layer does not work anymore for newly created shapefiles -2011-10-21 Tim Sutton +Juergen E. Fischer 2013-06-06 - * : commit b0112f1c427d38bf7996a86b07e9f056eb41b177 Merge: 5e45bda - b62daee Author: Tim Sutton Date: Thu Oct 20 - 15:36:13 2011 -0700 + german translation update -2011-10-20 Martin Dobias +Juergen E. Fischer 2013-06-06 - * src/app/qgslabelinggui.cpp, src/core/qgsexpression.cpp, - src/core/qgspallabeling.cpp, src/core/qgspallabeling.h, - src/gui/qgsexpressionbuilderdialog.cpp, - src/gui/qgsexpressionbuilderdialog.h, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h: Fix indentation + more edit widget fixes: + - handle editable state in drag&drop forms like in automatically generated + forms + - allow to set minimum size of webview "edit" widgets. -2011-10-20 Martin Dobias +Borys Jurgiel 2013-06-05 - * : commit 5e45bda419219848a50d3f727520fb397333180e Author: Juergen - E. Fischer Date: Wed Oct 19 22:33:33 2011 +0000 + Enable SEXTANTE plugin by default -2011-10-19 Werner Macho +Borys Jurgiel 2013-06-05 - * i18n/qgis_hr_HR.ts: translation update: hr by Zoran + Allow "Experimental" status also for c++ plugins. Mark Globe plugin experimental. -2011-10-19 Nathan Woodrow +Marco Hugentobler 2013-06-05 - * src/core/qgslabel.cpp: revert changes to old QgsLabel class + Clear cached geometries after commit / rollback. Fixes ticket #7950 -2011-10-19 Giuseppe Sucameli +Juergen E. Fischer 2013-06-05 - * src/app/qgsrasterlayerproperties.cpp, - src/core/raster/qgsrasterlayer.cpp: Handle raster layer's - transparency band while rendering (fix #2491) + german translation update -2011-10-18 Martin Dobias +Juergen E. Fischer 2013-06-05 - * src/app/qgslabelinggui.cpp: Enable "add direction symbol" only for - line layers (#4387) + get translation stats right by temporary updating all ts files -2011-10-18 Martin Dobias +Juergen E. Fischer 2013-06-05 - * src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wfs/qgswfsprovider.cpp, - src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h, - src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmsprovider.h: Move selectWidget() and - dataCapabilities() to data items file where it belongs + indentation update -2011-10-18 Martin Dobias +vinayan 2013-06-05 - * src/providers/gdal/CMakeLists.txt, - src/providers/gdal/qgsgdaldataitems.cpp, - src/providers/gdal/qgsgdaldataitems.h, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h: Separate GDAL data items from - provider code + fix zoom issue for new shapefiles -2011-10-18 Martin Dobias +Merge: 0f8de7d 25c76e6 +Werner Macho 2013-06-05 - * src/providers/ogr/CMakeLists.txt, - src/providers/ogr/qgsogrdataitems.cpp, - src/providers/ogr/qgsogrdataitems.h, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: Separate OGR data items from - provider code + Merge pull request #635 from imincik/slovak + + Slovak translation update. -2011-10-18 Martin Dobias +Ivan Mincik 2013-06-05 - * src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: Properly support OGR sublayers - (with createChildren) to avoid #4400 + Slovak translation update. -2011-10-18 Martin Dobias +Nathan Woodrow 2013-06-05 - * src/core/qgsdataitem.cpp, src/core/qgsdataitem.h: Add a default - icon for data collections + Use qRound. Rename menu item -2011-10-18 Martin Dobias +Borys Jurgiel 2013-05-27 - * src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h: Fix refresh of - postgis schema in browser (#4400) + [Plugin Manager] remove the old plugin_installer plugin -2011-10-18 Martin Dobias +Borys Jurgiel 2013-05-27 - * src/core/qgsdataitem.cpp, src/core/qgsdataitem.h, - src/providers/wms/qgswmsdataitems.cpp: Generic icon for raster - layers in browser + Code cleanups -2011-10-18 Martin Dobias +Borys Jurgiel 2013-05-27 - * src/core/qgsbrowsermodel.cpp, src/core/qgsdataitem.h, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrprovider.cpp: Show full path of gdal/ogr - layers as a tooltip (#4399) + More icons from Robert -2011-10-18 Nathan Woodrow +Larry Shaffer 2013-05-25 - * : Merge remote-tracking branch 'upstream/master' into - expression-labels Conflicts: src/core/qgsexpression.cpp src/gui/CMakeLists.txt + Add ability to run plugin installer from build directory + + - Update targets to new coding standard of using hyphens + - Add console and plugin installer to WITH_PY_COMPILE target -2011-10-17 Martin Dobias +Borys Jurgiel 2013-05-19 - * images/images.qrc, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wms/qgswmsdataitems.cpp: Add icons for browser from - Robert (gis theme only) + New Plugin Manager -2011-10-17 root +Matthias Kuhn 2013-06-05 - * i18n/qgis_it.ts: More minor fix to IT GUI + When calling setFields, automatically initalize attributes + That what you want most of the time when creating a new feature within a plugin. + Therefore defaults to true when used from python, but to false when used from C++ -2011-10-17 Nathan Woodrow +vinayan 2013-06-05 - * src/core/qgsexpression.cpp, - src/gui/qgsexpressionbuilderdialog.cpp, - src/gui/qgsexpressionbuilderdialog.h, - src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h: Add more function help; Fix - header email info + Offline Editing Plugin - Windows Fix -2011-10-17 Nathan Woodrow +Nathan Woodrow 2013-06-05 - * src/CMakeLists.txt: Revert CMakeList to normal + Enable touch for the map canvas on windows -2011-10-17 pcav +Merge: 068da60 c2a458e +Nathan Woodrow 2013-06-04 - * : commit 93c2fecfdd3ddf1d4b718e4f5c245ad21cba68dd Author: pcav - Date: Fri Oct 14 14:27:05 2011 +0200 + Merge pull request #631 from imincik/cmdout + + Cleanup of 'qgis --help' output. -2011-10-16 Nathan Woodrow +Etienne Tourigny 2013-06-04 - * src/gui/qgsexpressionbuilderwidget.cpp, - src/gui/qgsexpressionbuilderwidget.h: Add missing files; add more - operators + GdalTools overview : update for qgis and sip api, remove old widgets -2011-10-16 Nathan Woodrow +Etienne Tourigny 2013-06-04 - * src/gui/CMakeLists.txt, src/gui/qgsexpressionbuilder.cpp, - src/gui/qgsexpressionbuilder.h, src/ui/qgsexpressionbuilder.ui, - src/ui/qgsexpressionbuilderdialogbase.ui: Rename files to fit QGIS - coding guidelines + fix buildVRT dialog -2011-10-16 Nathan Woodrow +Etienne Tourigny 2013-06-04 - * src/ui/qgsexpressionbuilder.ui: Update UI spacing + fix buildSupportedRasterFileFilter for sip api v2 -2011-10-16 Nathan Woodrow +Ivan Mincik 2013-06-04 - * src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.h, - src/gui/qgsexpressionbuilderdialog.h: Update comments + Cleanup of 'qgis --help' output. -2011-10-16 Nathan Woodrow +Nyall Dawson 2013-06-04 - * src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h: - Add item from value list on double click + Don't append "Missing group" to non-standard expression groups, so that python plugins which provide expressions can create their own groups -2011-10-16 Nathan Woodrow +Werner Macho 2013-06-04 - * src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h: - Wire up operator buttons + translation update: eu by asier -2011-10-15 marco +Larry Shaffer 2013-06-04 - * src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h: Default constructor of - QgsProjectParser is private + Fix for #7993 again, fields are listed twice in labeling data defined menu + + - Reverts 0192e37 + - Move code from init() to ctor for fix and to ensure connections are not duplicated + - New code also fixes previously unknown issue when loading .qml style -2011-10-15 marco +Juergen E. Fischer 2013-06-04 - * src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h: Some xml optimisation for WMS - server + optionally label attribute editor widgets on top -2011-10-15 marco +Juergen E. Fischer 2013-06-04 - * src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsconfigparser.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp, - src/mapserver/qgssldparser.h: WMS server: avoid reading layer - symbology if the request does not come from SLD + WebView attribute editor fixes: + - allow browsing in readonly mode + - add option to open page in default browser + - add tooltips to editor push buttons -2011-10-15 marco +Juergen E. Fischer 2013-06-04 - * : commit 0359e5b41760048b1f21e301a66bbb19becf59cf Merge: 4e6f83b - 0d187bf Author: Nathan Woodrow Date: Sat Oct - 15 16:58:54 2011 +1000 + fix #7828 -2011-10-15 Nathan Woodrow +Merge: f9a0a1d b7c07de +mhugent 2013-06-04 - * src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h, - src/ui/qgsexpressionbuilder.ui: Remove red highlight from textarea; - show expresion invaild note in preview area with more info button; - remove live preview checkbox and update button (not needed at this - time) + Merge pull request #632 from BioEcoForests/master + + Always delete WFS network replies, fixes #7588 -2011-10-13 Martin Dobias +Laurent Defert 2013-06-04 - * src/core/qgsdataitem.cpp, src/core/qgsdataitem.h, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wms/qgswmsdataitems.cpp: Add error item to facilitate - error handling + Always delete WFS network replies, fixes #7588 -2011-10-13 Martin Dobias +Radim Blazek 2013-06-04 - * src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h: WMS: add/edit/delete connection - from data items + fixed rashes in atlas calling vector methods for rasters, fixes #7963 -2011-10-13 Martin Dobias +Radim Blazek 2013-06-04 - * src/providers/wms/CMakeLists.txt, - src/providers/wms/qgswmsdataitems.cpp, - src/providers/wms/qgswmsdataitems.h, - src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmsprovider.h: Move WMS data items to separate - file + OGR layers with unknown geometry type containing single geometry type fix, fixes #7995 -2011-10-13 Martin Dobias +Merge: f012065 81a960b +Werner Macho 2013-06-03 - * src/app/qgsbrowserdockwidget.cpp, src/browser/qgsbrowser.cpp: - Refresh item also when it had no children (they could be added in - meanwhile) + Merge pull request #630 from SrNetoChan/master + + pt_PT translations by João Gaspar -2011-10-14 Tim Sutton +Giuseppe Sucameli 2013-06-04 - * : commit 10d81dd7436d575868c40815fe2c7db2bb0bb2a4 Author: marco - Date: Thu Oct 6 11:28:50 2011 +0200 + DBManager: remove empty line from sql editor -2011-10-13 Marco Hugentobler +Giuseppe Sucameli 2013-06-04 - * src/plugins/interpolation/qgsinterpolationdialog.cpp, - src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin. - cpp: Fix for ticket #4308 + DBManager: updated to new SIP API -2011-10-12 Juergen E. Fischer +Nyall Dawson 2013-06-04 - * debian/changelog, debian/qgis.install: debian packaging update + Fix #4419, improve random color ramp appearance and generate colors with better chance of uniqueness -2011-10-11 Martin Dobias +Nyall Dawson 2013-06-04 - * src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wms/qgswmsconnection.cpp, - src/providers/wms/qgswmsconnection.h, - src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmssourceselect.cpp: Minor housekeeping in WMS - and WFS + Fix tests after changing default map overview style -2011-10-11 Martin Dobias +Nathan Woodrow 2013-06-04 - * src/core/qgsexpression.cpp, tests/src/core/testqgsexpression.cpp: - Expressions: add exp,ln,log10,log functions (#4365) + Fix projection selection with new files -2011-10-11 Martin Dobias +Etienne Tourigny 2013-06-03 - * src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h: WFS: do not show ok/cancel - when embedded in qbrowser + fixes for gdaltools info and clipper - raster file dialog filters needs fixing -2011-10-11 Martin Dobias +Larry Shaffer 2013-06-03 - * src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wfs/qgswfsdataitems.h: WFS: add/edit/delete actions in - browser + Update main options dialog with QgsOptionsDialogBase inheritance + + - Moved current tab setting to /Windows/Options/tab, as used in QgsOptionsDialogBase + - Caveat: old setting /Windows/Options/row is not honored on first launch after update -2011-10-11 Juergen E. Fischer +Nathan Woodrow 2013-06-04 - * src/providers/wfs/qgswfssourceselect.h: drop non-existing slot + Patch from Matthias for gdal tools -2011-10-11 Martin Dobias +Nyall Dawson 2013-06-04 - * src/providers/wfs/qgswfsdataitems.cpp, - src/providers/wfs/qgswfsdataitems.h, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h: WFS: add support (#4164) + Fix #7705, remove alpha transparency from default color for map overview frames -2011-10-08 Martin Dobias +Larry Shaffer 2013-06-03 - * src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsconnection.h, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h: WFS: Move uri logic and - GetCapabilities parsing to WFSConnection class. + Fix #7993, fields are listed twice in labeling data defined menu -2011-10-07 Martin Dobias +Merge: 75cbdf6 e46795a +Nathan Woodrow 2013-06-03 - * src/gui/qgsprojectionselector.cpp: Fix for a crash in projection - selection + Merge pull request #629 from volaya/sipapi + + [sextante] updated to new sip api -2011-10-07 Martin Dobias +Victor Olaya 2013-06-03 - * images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/plugins/CMakeLists.txt, src/plugins/wfs/CMakeLists.txt, - src/plugins/wfs/qgswfsplugin.cpp, src/plugins/wfs/qgswfsplugin.h, - src/plugins/wfs/qgswfssourceselect.cpp, - src/plugins/wfs/qgswfssourceselect.h, - src/plugins/wfs/qgswfssourceselectbase.ui, - src/plugins/wfs/wfsplugin.qrc, src/providers/wfs/CMakeLists.txt, - src/providers/wfs/qgswfsconnection.cpp, - src/providers/wfs/qgswfsconnection.h, - src/providers/wfs/qgswfsprovider.cpp, - src/providers/wfs/qgswfssourceselect.cpp, - src/providers/wfs/qgswfssourceselect.h, src/ui/qgisapp.ui, - src/ui/qgswfssourceselectbase.ui: Move wfs gui to provider. Remove - wfs plugin. + [sextante] updated to new sip api -2011-10-07 Martin Dobias +Werner Macho 2013-06-04 - * src/providers/postgres/CMakeLists.txt, - src/providers/postgres/qgspostgresdataitems.cpp, - src/providers/postgres/qgspostgresdataitems.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: Move PG data items to - separate cpp/h files + update Galician language strings on request -2011-10-07 Martin Dobias +SrNetoChan 2013-06-03 - * src/app/qgsbrowserdockwidget.cpp, src/core/qgsdataitem.h, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: Add, edit and remove - PG connections in browser dock + pt_PT translation by João Gaspar -2011-10-07 Martin Dobias +D'Hont René-Luc 2013-06-03 - * src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h: - Add refresh button to browser dock (#4272) + QGIS Server - GetPrint request does not respect text boxes size and position if dynamic content passed + + This commit brings some correction for the issue #7894 + Firstly the use of adjustSizeToText has been inactivate + Secondly if a composerLabel is not in the parameterMap the default value + is conserved. -2011-10-11 Juergen E. Fischer +Larry Shaffer 2013-06-03 - * CMakeLists.txt: "fix" warnings + Fix #7969, 'layer source' in vector properties is empty + + - Revert part of 6c51965, where setting the line edit field was (accidentally?) removed -2011-10-11 Nathan Woodrow - - * src/app/qgslabelinggui.cpp: used Python "and" keyword instead of - && :S - -2011-10-11 Nathan Woodrow - - * src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h, - src/ui/qgsexpressionbuilder.ui: Added expression output preview - area. Thanks to Andy Bates for the idea - -2011-10-10 Marco Hugentobler - - * - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - r.cpp: Fix shift in point displacement renderer - -2011-10-09 Nathan Woodrow - - * src/ui/qgsexpressionbuilder.ui: Rename buttons and groupbox name - -2011-10-09 Nathan Woodrow - - * src/app/qgslabelinggui.cpp, src/gui/CMakeLists.txt, - src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h, - src/gui/qgsexpressionbuilderdialog.cpp, - src/gui/qgsexpressionbuilderdialog.h, - src/ui/qgsexpressionbuilder.ui, - src/ui/qgsexpressionbuilderdialogbase.ui: Added new dialog for - generic expression builder; Added search to function list; Right - click to load sample 10-All values - -2011-10-08 mattwigway - - * BUGS, README: Corrected URLs for GitHub and for the issue tracker - (it now points to Redmine). - -2011-10-09 Nathan Woodrow - - * src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.cpp, - src/gui/qgsexpressionbuilder.h, src/ui/qgsexpressionbuilder.ui, - src/ui/qgslabelingguibase.ui: Add signal for expression parsed in - widget; fixed enabling of controls in labeling gui; comments - -2011-10-08 Juergen E. Fischer - - * cmake/FindSpatialindex.cmake, - ms-windows/osgeo4w/package-nightly.cmd, - ms-windows/osgeo4w/package.cmd: osgeo4w update: use external - libspatialindex - -2011-10-08 Juergen E. Fischer - - * debian/changelog, debian/control.lucid, debian/control.maverick, - debian/control.natty, debian/control.oneiric, debian/rules: debian - packaging update: use libspatialindex on more distributions - -2011-10-08 Juergen E. Fischer - - * src/core/qgsspatialindex.cpp: fix last commit - -2011-10-08 Juergen E. Fischer - - * cmake/FindSpatialindex.cmake, debian/changelog, - debian/control.sid, debian/control.squeeze, debian/rules, - src/core/CMakeLists.txt, src/core/qgsspatialindex.cpp, - src/core/qgsspatialindex.h, src/core/spatialindex/README, - src/core/spatialindex/geometry/LineSegment.cc, - src/core/spatialindex/geometry/Point.cc, - src/core/spatialindex/geometry/Region.cc, - src/core/spatialindex/include/LineSegment.h, - src/core/spatialindex/include/Point.h, - src/core/spatialindex/include/PointerPool.h, - src/core/spatialindex/include/PoolPointer.h, - src/core/spatialindex/include/RTree.h, - src/core/spatialindex/include/Region.h, - src/core/spatialindex/include/SmartPointer.h, - src/core/spatialindex/include/SpatialIndex.h, - src/core/spatialindex/include/TemporaryFile.h, - src/core/spatialindex/include/Tools.h, - src/core/spatialindex/include/Version.h, - src/core/spatialindex/include/tools/PointerPool.h, - src/core/spatialindex/include/tools/PoolPointer.h, - src/core/spatialindex/include/tools/SmartPointer.h, - src/core/spatialindex/include/tools/Tools.h, - src/core/spatialindex/qgsspatialindex.cpp, - src/core/spatialindex/qgsspatialindex.h, - src/core/spatialindex/rtree/BulkLoader.cc, - src/core/spatialindex/rtree/BulkLoader.h, - src/core/spatialindex/rtree/Index.cc, - src/core/spatialindex/rtree/Index.h, - src/core/spatialindex/rtree/Leaf.cc, - src/core/spatialindex/rtree/Leaf.h, - src/core/spatialindex/rtree/Node.cc, - src/core/spatialindex/rtree/Node.h, - src/core/spatialindex/rtree/PointerPoolNode.h, - src/core/spatialindex/rtree/RTree.cc, - src/core/spatialindex/rtree/RTree.h, - src/core/spatialindex/rtree/Statistics.cc, - src/core/spatialindex/rtree/Statistics.h, - src/core/spatialindex/spatialindex/SpatialIndexImpl.cc, - src/core/spatialindex/spatialindex/SpatialIndexImpl.h, - src/core/spatialindex/src/rtree/BulkLoader.cc, - src/core/spatialindex/src/rtree/BulkLoader.h, - src/core/spatialindex/src/rtree/Index.cc, - src/core/spatialindex/src/rtree/Index.h, - src/core/spatialindex/src/rtree/Leaf.cc, - src/core/spatialindex/src/rtree/Leaf.h, - src/core/spatialindex/src/rtree/Node.cc, - src/core/spatialindex/src/rtree/Node.h, - src/core/spatialindex/src/rtree/PointerPoolNode.h, - src/core/spatialindex/src/rtree/RTree.cc, - src/core/spatialindex/src/rtree/RTree.h, - src/core/spatialindex/src/rtree/Statistics.cc, - src/core/spatialindex/src/rtree/Statistics.h, - src/core/spatialindex/src/spatialindex/LineSegment.cc, - src/core/spatialindex/src/spatialindex/Point.cc, - src/core/spatialindex/src/spatialindex/Region.cc, - src/core/spatialindex/src/spatialindex/SpatialIndexImpl.cc, - src/core/spatialindex/src/spatialindex/SpatialIndexImpl.h, - src/core/spatialindex/src/storagemanager/Buffer.cc, - src/core/spatialindex/src/storagemanager/Buffer.h, - src/core/spatialindex/src/storagemanager/DiskStorageManager.cc, - src/core/spatialindex/src/storagemanager/DiskStorageManager.h, - src/core/spatialindex/src/storagemanager/MemoryStorageManager.cc, - src/core/spatialindex/src/storagemanager/MemoryStorageManager.h, - src/core/spatialindex/src/storagemanager/RandomEvictionsBuffer.cc, - src/core/spatialindex/src/storagemanager/RandomEvictionsBuffer.h, - src/core/spatialindex/src/tools/Tools.cc, - src/core/spatialindex/storagemanager/Buffer.cc, - src/core/spatialindex/storagemanager/Buffer.h, - src/core/spatialindex/storagemanager/DiskStorageManager.cc, - src/core/spatialindex/storagemanager/DiskStorageManager.h, - src/core/spatialindex/storagemanager/MemoryStorageManager.cc, - src/core/spatialindex/storagemanager/MemoryStorageManager.h, - src/core/spatialindex/storagemanager/RandomEvictionsBuffer.cc, - src/core/spatialindex/storagemanager/RandomEvictionsBuffer.h, - src/core/spatialindex/tools/ExternalSort.cc, - src/core/spatialindex/tools/ExternalSort.h, - src/core/spatialindex/tools/TemporaryFile.cc, - src/core/spatialindex/tools/Tools.cc: finish #4111: - apply missing bits - update internal spatialindex copy to 1.6.1 - update debian packaging to use external library - -2011-10-07 Tim Sutton - - * CMakeLists.txt, COPYING, src/core/CMakeLists.txt: Apply partial - patch from #4111 to allow using separate spatialindex lib from - source tree if desired. - -2011-10-07 Juergen E. Fischer - - * python/core/qgsvectorlayer.sip, src/core/qgsvectorlayer.cpp, - src/core/qgsvectorlayer.h: [API] add QgsVectorLayer::updateFeature() - -2011-10-07 Juergen E. Fischer - - * src/core/qgsapplication.cpp: fix warning - -2011-10-07 Giuseppe Sucameli - - * : Merge remote-tracking branch 'brushtyler/master' Conflicts: src/providers/postgres/qgspostgresprovider.cpp - -2011-10-06 Tim Sutton - - * : commit 7e059aff9e6b19ad1c410d7d92294078b2347aa8 Author: Tim - Sutton Date: Thu Oct 6 14:06:08 2011 +0200 - -2011-10-06 Tim Sutton - - * scripts/make_gource_video.sh: Added gource script (thanks Nathan) - and qgis download stats - -2011-10-06 Nathan Woodrow - - * src/CMakeLists.txt, src/core/qgspallabeling.cpp, - src/core/qgspallabeling.h, src/gui/qgsexpressionbuilder.h: Add - method to access label string as expression, QgsExpression only - created once then cached. - -2011-10-05 Marco Hugentobler - - * src/mapserver/qgsprojectparser.cpp: Fix label id for GetPrint in - composer +Merge: 919aa04 6f2ddbc +Werner Macho 2013-06-03 -2011-10-04 Tim Sutton + Merge pull request #626 from imincik/slovak + + First batch of Slovak translation for version 2.0. - * src/core/qgsapplication.cpp: Dont use gdal c++ api. Also gdal - drivers now unloaded without restart +Merge: 8201335 aca38a8 +Werner Macho 2013-06-03 -2011-10-04 Sergey Yakushevs + Merge pull request #628 from qgis-jp/make_pull_req_from_ja + + update translation JA - * : Merge remote branch 'pb/master' Conflicts: src/plugins/roadgraph/linevectorlayerdirector.cpp +Salvatore Larosa 2013-06-03 -2011-10-03 Martin Dobias + [pyqgis-console] update help + - shows help at the first launch of the console - * src/providers/ogr/qgsogrprovider.cpp: Do not show file extension - in browser (#4309) +Juergen E. Fischer 2013-06-03 -2011-10-03 Martin Dobias + fix #7353 in case the snapping dialog is not docked - * src/providers/ogr/qgsogrprovider.cpp: Do not include |layerid=X if - the layer is not a collection (#4309) +yoichigmf 2013-06-04 -2011-10-03 Martin Dobias + update translation JA - * src/core/symbology-ng/qgslinesymbollayerv2.cpp: Ensure that we - have a valid line in line decoration (#4241) +Ivan Mincik 2013-06-03 -2011-10-03 Juergen E. Fischer + Slovak ts file update. - * src/core/qgscoordinatereferencesystem.cpp: yet another take on - matching proj4string in our database +Ivan Mincik 2013-06-03 -2011-10-03 Marco Hugentobler + First batch of Slovak translation for version 2.0. +- translation +- merge with 4b76600 (adding function_help, context_help) - * src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fix for wrong - symbol scaling if symbol size is defined in map units and symbol - size below one pixel +Merge: 21a884b d4945db +Ivan Mincik 2013-06-03 -2011-10-02 Juergen E. Fischer + Merge branch 'master' into slovak - * debian/changelog, debian/libqgis{QGIS_ABI}.install: debian - packaging update +Radim Blazek 2013-06-03 -2011-10-02 Juergen E. Fischer + flatten geometries in virtual ogr sublayers, i.e. mix 2D and 25D - * src/analysis/network/qgsgraphanalyzer.cpp, - src/analysis/network/qgsgraphbuilderintr.h, - src/analysis/network/qgslinevectorlayerdirector.h, - src/plugins/roadgraph/roadgraphplugin.h, - src/plugins/roadgraph/shortestpathwidget.cpp: fix windows build +Alexander Bruy 2013-06-03 -2011-10-02 Alexander Bruy + update MapServer export plugin to SIP changes - * src/analysis/network/qgsgraph.cpp, - src/analysis/network/qgsgraph.h, - src/analysis/network/qgsgraphanalyzer.cpp, - src/plugins/roadgraph/shortestpathwidget.cpp: fix network-analysis - API and export function in RoadGraph plugin (fix #4341) +Alexander Bruy 2013-06-03 -2011-10-02 Alexander Bruy + minor update in sextante taudem provider - * src/analysis/network/qgsgraph.h: include QgsGraphArc description - in Doxygen output (fix #4342) +Alexander Bruy 2013-06-03 -2011-09-30 Juergen E. Fischer + more SIP updates for fTools - * src/core/qgscoordinatetransform.cpp: fix #4282 +Juergen E. Fischer 2013-06-03 -2011-09-30 Juergen E. Fischer + fix #7982 - * src/analysis/network/qgsarcproperter.h, - src/analysis/network/qgsdistancearcproperter.cpp, - src/analysis/network/qgsgraphbuilderintr.h, - src/analysis/network/qgsgraphdirector.h: fix warnings +Marco Hugentobler 2013-06-03 -2011-09-21 Alister + Log WFS errors - * doc/INSTALL.t2t, doc/changelog.t2t, resources/customization.xml, - src/analysis/network/qgsgraphanalyzer.cpp, - src/browser/qgsbrowser.cpp, src/core/qgsapplication.cpp, - src/core/qgsrasterprojector.cpp, src/core/raster/qgsrasterlayer.h, - src/core/raster/qgsrastertransparency.cpp, - src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp, - src/plugins/georeferencer/qgsgeorefplugingui.h, - src/plugins/globe/globe_plugin.h, - src/providers/postgres/qgspostgresconnection.cpp, - src/providers/postgres/qgspostgresconnection.h, - src/ui/qgsrasterlayerpropertiesbase.ui: fix minor typos + - scripts/chkspelling.sh run. +Juergen E. Fischer 2013-06-03 -2011-09-30 Alexander Bruy + followup 16ba01f7 for oracle & mssql - * src/analysis/network/qgsgraph.h: fix typo +Juergen E. Fischer 2013-06-02 -2011-09-30 Alexander Bruy + indentation update - * src/analysis/network/qgsgraph.h: translate comments in English - (fix for #4338) +Juergen E. Fischer 2013-06-02 -2011-09-30 Juergen E. Fischer + fix #7353 - * src/app/qgsuniquevaluedialog.cpp: fix #4331 +Juergen E. Fischer 2013-06-02 -2011-09-30 Juergen E. Fischer + else cascade cleanups - * i18n/qgis_de.ts: german translation update +Juergen E. Fischer 2013-06-02 -2011-09-30 Juergen E. Fischer + drop unused QgsMapToolAddVertex, QgsMapToolDeleteVertex and QgsMapToolMoveVertex - * src/analysis/network/qgsarcproperter.h, - src/analysis/network/qgsdistancearcproperter.cpp, - src/analysis/network/qgsgraph.cpp, src/analysis/network/qgsgraph.h, - src/analysis/network/qgsgraphanalyzer.cpp, - src/analysis/network/qgsgraphbuilder.h, - src/analysis/network/qgsgraphbuilderintr.h, - src/analysis/network/qgsgraphdirector.h, - src/analysis/network/qgslinevectorlayerdirector.cpp, - src/analysis/network/qgslinevectorlayerdirector.h, - src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/plugins/roadgraph/roadgraphplugin.cpp, - src/plugins/roadgraph/shortestpathwidget.cpp, - src/plugins/roadgraph/speedproperter.cpp, - src/plugins/roadgraph/speedproperter.h: indentation update - please - use prepare-commit.sh +Juergen E. Fischer 2013-06-02 -2011-09-30 mhugent + rename context help from QgsIdentifyResults to QgsIdentifyResultsDialog - * : Merge pull request #49 from stopa85/network-analysis Network analysis and road-graph-plugin +Larry Shaffer 2013-06-02 -2011-09-29 Juergen E. Fischer + Save/restore header state for bookmarks view - * src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/postgres/qgspostgresprovider.cpp, - tests/src/core/testqgsapplication.cpp: fix some warnings +Larry Shaffer 2013-06-02 -2011-09-29 Juergen E. Fischer + Fix #7723, bookmark names not saved + + - Allow bookmarks database table to be edited + - Store project file name with new bookmark, if custom project title not set - * debian/changelog, debian/control.lenny, debian/control.lucid, - debian/control.maverick, debian/control.natty, - debian/control.oneiric, debian/control.sid, debian/control.squeeze, - debian/qgis-sqlanywhere.install.in, - debian/qgis-sqlanywhere.lintian-overrides, - debian/qgis-sqlanywhere{QGIS_ABI}.install, - debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides: debian - packaging update +D'Hont René-Luc 2013-06-02 -2011-09-24 Juergen E. Fischer + QGIS-Server doesn't publish vector layer without geometry in WMS + + Because vector layer without geometry hasn't rendered by QGIS, the + QGIS-Server doesn't publish these layer. - * scripts/astyle-all.sh, src/app/qgisapp.cpp, src/app/qgisapp.h, - src/app/qgsconfigureshortcutsdialog.cpp, - src/app/qgsconfigureshortcutsdialog.h, - src/app/qgsdecorationcopyright.cpp, - src/app/qgsdecorationcopyright.h, src/app/qgsmaptoolidentify.cpp, - src/app/qgsoptions.cpp, src/app/qgsoptions.h, - src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/core/qgsproviderregistry.cpp, src/core/qgsrasterdataprovider.h, - src/core/qgsvectorlayerimport.cpp, - src/core/raster/qgspseudocolorshader.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/core/symbology-ng/qgssinglesymbolrendererv2.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/core/symbology-ng/qgssymbolv2.cpp, - src/core/symbology-ng/qgssymbolv2.h, src/gui/qgsquerybuilder.h, - src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp, - src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/plugins/grass/qgsgrassbrowser.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h, - src/providers/postgres/qgspgsourceselect.cpp, - src/providers/postgres/qgspgsourceselect.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h, - src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h, - tests/src/core/testqgsapplication.cpp: indentation update +Juergen E. Fischer 2013-05-31 -2011-09-29 Tim Sutton + debian packaging update - * src/core/composer/qgscomposermap.cpp: Revert "Applied fix for - #4283" This reverts commit 7f3e9560fc93cd8b3ea4039f319bca568e17bb38. +Juergen E. Fischer 2013-06-02 -2011-09-29 Tim Sutton + fix doxygen warning - * ChangeLog: Another valiant attempt at spurious changelog - suppression. +Larry Shaffer 2013-06-01 -2011-09-29 Tim Sutton + Fix for #7458, project crashes when loaded from command line + + - Image selection previews now load only on first expansion of parent group box + - Note: this is an OK fix for 2.0 release. One better solution noted here: http://hub.qgis.org/issues/7458#note-12 - * : commit 3cac713cc39652e048badfe605fb0fd9ac372fb4 Author: - Alexander Bruy Date: Wed Sep 28 - 14:44:28 2011 +0300 +Chris Crook 2013-06-02 -2011-09-28 Marco Hugentobler + Fix to potential unterminated loop if a delimited text file is deleted + + Another try at fixing test cases with file watcher, don't work on some + platforms. - * src/mapserver/qgshttprequesthandler.cpp: Send exception in case of - unknown feature info format +vinayan 2013-06-01 -2011-09-28 Marco Hugentobler + Ftools-Sum Line length - Fix progress bar - * src/mapserver/qgswmsserver.cpp: Add feature bounding box to - GetFeatureInfo response if invoked with filter and without x/y - coordinates +Chris Crook 2013-06-01 -2011-09-27 mhugent + Removing a couple more delimited text file test case failures - * : Merge pull request #48 from linz/wfs_layer_sort Added sorting to WFS layer tree grid widget +Salvatore Larosa 2013-05-31 -2011-09-27 Sergey Yakushevs + [pyqgis-console] shows info messages also for temporary scripts - * : Merge remote branch 'pb/master' into network-analysis Conflicts: python/CMakeLists.txt src/analysis/network/qgsgraphbuilder.h src/plugins/roadgraph/graphbuilder.h src/plugins/roadgraph/linevectorlayerdirector.cpp src/plugins/roadgraph/simplegraphbuilder.cpp src/plugins/roadgraph/utils.cpp src/plugins/roadgraph/utils.h +Radim Blazek 2013-05-31 -2011-09-26 Marco Hugentobler + OGR provider - virtual sublayers for each geometry type in multi geometry layers, fixes #7895 - * - src/plugins/point_displacement_renderer/qgspointdisplacementrendere - rwidgetbase.ui: Enhance maximum for point displacement tolerance - (ticket #4319) +Sandro Santilli 2013-05-31 -2011-09-26 Nathan Woodrow + Further reduction of instance copies - * src/core/qgsexpression.cpp, src/core/qgsexpression.h, - src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h: - Read functions from QgsExpression. Updated FunctionDef to store - group name and help text. Add comments to code NOTE: Reading - functions list not working yet. +Sandro Santilli 2013-05-31 -2011-09-25 Juergen E. Fischer + More const correctness and pass-by-ref - * debian/qgis-common.install, debian/rules, doc/CMakeLists.txt: - debian packaging update +Sandro Santilli 2013-05-30 -2011-09-25 Tim Sutton + Fix width of line decoration for selected features (ticket #7410) - * src/app/qgisapp.cpp: Restore override cursor when about box is - shown +Radim Blazek 2013-05-31 -2011-09-25 Tim Sutton + JTSK EPSG codes update, added new codes, updated existing. + + INSERT INTO tbl_srs VALUES (NULL,'S-JTSK (Greenwich) / Krovak','krovak','bessel','+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=589,76,480,0,0,0,0 +pm=greenwich +units=m +no_defs',5513,'EPSG','5513',0,0); + + INSERT INTO tbl_srs VALUES (NULL,'S-JTSK (Greenwich) / Krovak East North','krovak','bessel','+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=589,76,480,0,0,0,0 +pm=greenwich +units=m +no_defs',5514,'EPSG','5514',0,0); + + INSERT INTO tbl_srs VALUES (NULL,'S-JTSK (Ferro) / Krovak East North','krovak','bessel','+proj=krovak +lat_0=49.5 +lon_0=42.5 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=589,76,480,0,0,0,0 +pm=ferro +units=m +no_defs',5221,'EPSG','5221',0,0); + + -- Add alpha to 2065 + UPDATE tbl_srs set parameters = '+proj=krovak +lat_0=49.5 +lon_0=42.5 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=589,76,480,0,0,0,0 +pm=ferro +units=m +no_defs' WHERE auth_id = '2065'; + + -- Add towgs84 to 102067 + UPDATE tbl_srs set description = 'S-JTSK (Greenwich) / Krovak East North', parameters = '+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +towgs84=589,76,480,0,0,0,0 +pm=greenwich +units=m +no_defs', deprecated = 1 WHERE auth_id = '102067'; - * : commit 93a190a38210c508617ae0da2a8faacf0bf806b3 Author: Tim - Sutton Date: Sun Sep 25 00:32:43 2011 +0200 +Alexander Bruy 2013-05-31 -2011-09-24 Tim Sutton + more api updates in fTools (still incomplete) - * : commit a0f8294ce6bf4e808252ca12bd764212712345f0 Author: marco - Date: Sat Sep 24 22:16:26 2011 +0200 +D'Hont René-Luc 2013-05-31 -2011-09-24 pcav + Add GetContext request to QGIS WMS Server + + This non standard request retruns the QGIS project as an OWSContext + document version 0.3.1. + This request gives more interoperability to QGIS Server that can be + directly used in client supporting OWSContext as config file. + This function has been funded by Ifremer. - * src/plugins/grass/modules-6.3/default.qgc, - src/plugins/grass/modules-6.4/default.qgc: Typos in GRASS command - list +Merge: 32da891 c1797fc +mhugent 2013-05-31 -2011-09-24 Tim Sutton + Merge pull request #623 from biolds/master + + Fix crash when authentication fails. Fix #7913 - * src/app/qgisapp.cpp: Resolved merge conflicts from applying - 8c3e0669226e1861da9134266675df7ed67cf971 to master +Radim Blazek 2013-05-31 -2011-09-24 Tim Sutton + GRASS shell cursor shift fix better - * src/app/qgisapp.cpp, src/app/qgsabout.cpp, src/app/qgsabout.h, - src/ui/qgsabout.ui: Resolved merge conflicts from applying - 36d86b019574ccb3c0c962c680093b5784f052dc to master +Nathan Woodrow 2013-05-31 -2011-09-24 Tim Sutton + Fix crash in sip using QString - * doc/CMakeLists.txt, doc/SPONSORS, doc/changelog.t2t, - src/ui/qgssponsorsbase.ui: Resolved merge conflicts from applying - 29f93f1b01ebf9799256ab55557370fbf051df44 to master +Merge: a2fc3b4 3acb48d +Werner Macho 2013-05-30 -2011-09-23 Tim Sutton + Merge pull request #624 from rduivenvoorde/nl + + nl update - * CHANGELOG, doc/changelog.html, doc/changelog.t2t, doc/index.html, - doc/style.css: Backported changelog and style changes from 1.7 - branch +Richard Duivenvoorde 2013-05-30 -2011-09-24 pcav + nl update - * src/plugins/grass/modules-common/v.generalize.qgm: Fix to - v.generalize for recent GRASS versions +Radim Blazek 2013-05-30 -2011-09-23 Juergen E. Fischer + set correctly raster block nodata if layer extent or resolution is smaller than requested, fixes #7209 - * src/providers/wms/qgswmsprovider.cpp, - src/providers/wms/qgswmsprovider.h: wms provider updates: - don't repeat WMS parameters (eg. when VERSION is specified in the - WMS connection's url) - allow wms tags to e prefixed with "wms:" (as from XtraServer with - WMS 1.3) +Marco Hugentobler 2013-05-30 -2011-09-22 Tim Sutton + Keep selection if exchanging ids for added features, safety check for 0 geometry in splitFeatures method - * src/core/composer/qgscomposermap.cpp: Applied fix for #4283 +Juergen E. Fischer 2013-05-30 -2011-09-22 Tim Sutton + more Quantum GIS => QGIS updates - * src/ui/qgsattributetabledialog.ui: Apply patch from Nathan Woodrow - to resolve attribute dialog save button issue #4290 +Radim Blazek 2013-05-30 -2011-09-22 Jeremy Palmer + GRASS - set correctly qtermwidget font, fixes #7340 - * src/plugins/wfs/qgswfssourceselectbase.ui: Added sorting to WFS - layer tree grid widget +D'Hont René-Luc 2013-05-30 -2011-09-20 marco + Advertised WFS URL + + Like WMS services, users can configure an advertised URL for WFS + services. + If no advertised WFS URL is specified, QGIS-Server looked at the + advertised WMS URL. - * : commit 8a9da0f2278f46717b74eab313d475837d2ab568 Author: marco - Date: Tue Sep 20 14:38:30 2011 +0200 +Alexander Bruy 2013-05-30 -2011-09-19 Marco Hugentobler + start update fTools to new SIP api - * src/core/composer/qgscomposermap.cpp: Fix for ticket #4283 - (composer forgets on/off status of layers) +Larry Shaffer 2013-05-30 -2011-09-18 marco + Add missing signal/slot connection, for limiting labels drawn - * src/app/qgscustomization.cpp: Prevent Qt assert when using Qt - debug compiled +Laurent Defert 2013-05-29 -2011-09-17 Juergen E. Fischer + Fix crash when authentication fails. Fix #7913 + + - Fix pointer dereferencing + - Remove call to uninitialized button + As stated by Valgrind: + + ==13851== Use of uninitialised value of size 8 + ==13851== at 0x9961780: QWidget::setEnabled(bool) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.2) + ==13851== by 0x27600FB1: QgsWFSSourceSelect::capabilitiesReplyFinished() (qgswfssourceselect.cpp:211) + ==13851== by 0x2760B78F: QgsWFSSourceSelect::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_qgswfssourceselect.cxx:156) + ==13851== by 0x93F554E: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2) + ==13851== by 0x2760A458: QgsWFSCapabilities::gotCapabilities() (moc_qgswfscapabilities.cxx:103) + ==13851== by 0x275F88CD: QgsWFSCapabilities::capabilitiesReplyFinished() (qgswfscapabilities.cpp:156) + ==13851== by 0x2760A331: QgsWFSCapabilities::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_qgswfscapabilities.cxx:54) + ==13851== by 0x93F554E: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2) + ==13851== by 0xA46E824: ??? (in /usr/lib/x86_64-linux-gnu/libQtNetwork.so.4.8.2) + ==13851== by 0xA4DC904: ??? (in /usr/lib/x86_64-linux-gnu/libQtNetwork.so.4.8.2) + ==13851== by 0x93F4A2D: QObject::event(QEvent*) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2) + ==13851== by 0x991470B: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.2) + ==13851== - * i18n/qgis_de.ts, src/app/qgsmergeattributesdialog.cpp, - src/app/qgsmergeattributesdialog.h: add support "sum" operation to - merge attribute dialog +Radim Blazek 2013-05-30 -2011-09-16 Juergen E. Fischer + GRASS fixes: remember last mapset, update layer list in tools if a layer is added/removed - * i18n/qgis_de.ts: german translation update +D'Hont René-Luc 2013-05-30 -2011-09-07 Juergen E. Fischer + Add FeatureListURL in QGIS WMS Server GetCapabilities Request + + When a layer is published as a WFS FeatureType, WMS GetCapabilities + Answer containing a FeatureListURL. The FeatureListURL contains an + OnlineResource element with the URL to the layer in GML. - * debian/changelog, debian/watch: update debian/watch +Radim Blazek 2013-05-30 -2011-09-15 Alexander Bruy + GRASS v.in.ogr.qgis postgres - set schemas option, fixes #7427 - * python/plugins/osm/OsmAddRelationDlg.py, - python/plugins/osm/OsmDownloadDlg.py, - python/plugins/osm/OsmFeatureDW.py, - python/plugins/osm/OsmImportDlg.py, - python/plugins/osm/OsmLoadDlg.py, python/plugins/osm/OsmPlugin.py, - python/plugins/osm/OsmSaveDlg.py, - python/plugins/osm/OsmUndoRedoDW.py, - python/plugins/osm/OsmUploadDlg.py: more translatable strings in OSM - plugin +Juergen E. Fischer 2013-05-30 -2011-09-15 Giuseppe Sucameli + vector layer undo command: remove merging noise - * src/core/qgsvectorlayerimport.cpp: fix windows build error +Larry Shaffer 2013-05-29 -2011-09-15 Giuseppe Sucameli + Followup to fix for #7134, label settings not saved in .qml + + - Ensure labeling gui is restored in correct order + - Run style script on qgsmaplayer.cpp - * src/app/qgisapp.cpp, src/app/qgsidentifyresults.cpp, - src/app/qgsmaptoolidentify.cpp, src/app/qgsprojectproperties.cpp, - src/app/qgstilescalewidget.cpp, src/gui/qgsquerybuilder.h: clean up - the code to avoid deprecation and other warnings +Merge: f9ae9d5 085f636 +Nathan Woodrow 2013-05-29 -2011-09-15 Giuseppe Sucameli + Merge pull request #622 from slarosa/one_more_fix_sipapiv2 + + [pyqgis-console] set default value for splitters state - * python/core/qgsrasterlayer.sip, - src/core/raster/qgsrasterlayer.cpp, - src/core/raster/qgsrasterlayer.h: mark some methods as deprecated +Salvatore Larosa 2013-05-29 -2011-09-15 Giuseppe Sucameli + [pyqgis-console] set default value for splitters state - * : [FEATURE] Import a vector layer from a datasource to a different - one Merge of another part of my Summer of Code work (remote-tracking - branch 'brushtyler/import_layer') +Nathan Woodrow 2013-05-29 -2011-09-15 Giuseppe Sucameli + Fix #7134 - * src/core/qgsvectorlayerimport.cpp, - src/core/qgsvectorlayerimport.h: use a buffer when importing - features +Juergen E. Fischer 2013-05-29 -2011-09-14 Alexander Bruy + german translation update - * python/plugins/GdalTools/tools/widgetBuildVRT.ui, - python/plugins/GdalTools/tools/widgetClipper.ui, - python/plugins/GdalTools/tools/widgetGrid.ui, - python/plugins/GdalTools/tools/widgetMerge.ui, - python/plugins/GdalTools/tools/widgetProximity.ui: [BACKPORT] allow - negative NODATA values in GDALTools +Merge: 9db7ab9 b1843de +Nathan Woodrow 2013-05-29 -2011-09-14 pcav + Merge pull request #621 from slarosa/again_sipapiv2 + + [pyqgis-console] again more upadte for sip api v2 - * i18n/qgis_it.ts: Minor IT GUI translation improvements +Salvatore Larosa 2013-05-29 -2011-09-13 Giuseppe Sucameli + [pyqgis-console] again more upadte for sip api v2 - * : merge import_layer branch +Juergen E. Fischer 2013-05-29 -2011-09-13 Tim Sutton + - sync sip binding of QgsVectorLayer + - [API] introduce signal QgsVectorLayer::beforeRollBack() + - merge consecutive geometry changes (fixes #7929) + - avoid validation in nodetool on rollback - * : commit 907646164c2ba82097811b456f0e0925bd43d58c Author: Tim - Sutton Date: Tue Sep 13 11:01:11 2011 +0200 +Merge: d28d202 bc726dc +Matthias Kuhn 2013-05-29 -2011-09-12 Tim Sutton + Merge pull request #620 from slarosa/update_sipapiv2_console + + more update to console for sipapiv2 - * src/app/main.cpp, src/app/qgisapp.cpp, src/app/qgsoptions.cpp, - src/core/qgsapplication.cpp: Further fixes for selective GDAL driver - support (in progress) +Juergen E. Fischer 2013-05-29 -2011-09-12 Giuseppe Sucameli + fix #4103 - * python/core/core.sip, python/core/qgsproviderregistry.sip, - python/core/qgsvectorlayerimport.sip, src/core/CMakeLists.txt, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayerimport.cpp, - src/core/qgsvectorlayerimport.h, - src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h, - src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: Move import - feature main code to QgsVectorLayerImport and keep just few methods - in providers +Salvatore Larosa 2013-05-29 -2011-09-12 Tim Sutton + more update to console for sipapiv2 - * python/core/qgsapplication.sip, src/app/CMakeLists.txt, - src/app/qgisapp.cpp, src/app/qgsoptions.cpp, src/app/qgsoptions.h, - src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/providers/gdal/qgsgdalprovider.cpp, src/ui/qgsoptionsbase.ui: - [FEATURE] implement ability to skip specific drivers (fixes #182) +Matthias Kuhn 2013-05-29 -2011-09-12 Giuseppe Sucameli + Show call stack when python console open fails - * python/plugins/GdalTools/tools/GdalTools_utils.py: fix gdaltools - error checking for ogr layers +D'Hont René-Luc 2013-05-26 -2011-09-10 Giuseppe Sucameli + Using QgsMapLayer's title for QgsComposerLayerItem - * src/plugins/grass/qgsgrassbrowser.cpp, - src/plugins/grass/qgsgrassbrowser.h, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassmodule.h, - src/plugins/grass/qgsgrasstools.cpp, - src/providers/grass/qgsgrassprovider.cpp: Fix remove GRASS vector - map from mapset on Win OS (should be fix #3646 together with - grass-dev package), disable refresh button in GRASS browser if a - module is running +D'Hont René-Luc 2013-05-29 -2011-09-09 Juergen E. Fischer + Add metadata information for layers + + To complete the metadata tab and ilayer information, we add keywordlist, + metadata url and attribution information. + The user can add keywords to his layers, store a metadata url with type + and format and attribution title and url. + These data are reused by QGIS-Sever in the WMS GetCapabilities request. + This capability is sponsored by ifremer. - * python/gui/qgsquerybuilder.sip: trim qgsquerybuilder binding (and - fix it) +Matthias Kuhn 2013-05-29 -2011-09-08 Juergen E. Fischer + Set default values for python console settings - * python/gui/gui.sip, python/gui/qgsquerybuilder.sip: add bindings - for QgsQueryBuilder +Nathan Woodrow 2013-05-29 -2011-09-08 Tim Sutton + Start sipapi update - * doc/linux.t2t: Some documentation updates for linux +Alexander Bruy 2013-05-29 -2011-09-08 Tim Sutton + [sextante] fix issue with non-ASCII characters in layer selector - * doc/msvc.t2t: Replace svn url with git one for win install notes +Nathan Woodrow 2013-05-29 -2011-09-08 Werner Macho + Fix add class for graduated renderer. Fix #7726 - * i18n/qgis_mn.ts: translation update: mn by Bayarmaa +Nathan Woodrow 2013-05-29 -2011-09-08 Juergen E. Fischer + Fix removing composer legend items. Fix #7874 Fix #7464 - * src/gui/qgsquerybuilder.cpp, src/gui/qgsquerybuilder.h: missed to - include moved querybuilder files +Juergen E. Fischer 2013-05-29 -2011-09-08 Juergen E. Fischer + add missing sip bindings to QgsSublayersDialog - * src/app/CMakeLists.txt, src/app/qgsquerybuilder.cpp, - src/app/qgsquerybuilder.h, src/core/qgscrscache.h, - src/core/qgsdbfilterproxymodel.h, src/core/qgsdbtablemodel.h, - src/gui/CMakeLists.txt, src/providers/postgres/CMakeLists.txt, - src/providers/postgres/qgspgsourceselect.cpp: fix windows build - errors - moves QgsQueryBuilder from app to gui - links postgres provider with gui +Juergen E. Fischer 2013-05-29 -2011-09-08 Werner Macho + fix build error - * i18n/qgis_et.ts: translation update: et by Veiko +Juergen E. Fischer 2013-05-29 -2011-09-08 Martin Dobias + fix #7925 - * src/app/qgisapp.cpp: Delete rotate point map tool (#4268) +Victor Olaya 2013-05-28 -2011-09-06 Martin Dobias + [sextante] added new v.transform algorithm + + minor fix in r.stream.stats - * src/plugins/georeferencer/qgsgeorefplugin.cpp, - src/plugins/spatialquery/qgsspatialqueryplugin.cpp: Fix #4266 - - georeferencer and spatial query crashing on exit +Victor Olaya 2013-05-24 -2011-09-06 Martin Dobias + [sextante] some light code cleaning/polishing - * : [FEATURE] PostGIS connections and layer now available from - browser Merge of one part of Giuseppe's Summer of Code work +Etienne Tourigny 2013-05-28 -2011-09-06 Marco Hugentobler + fix loading of raster and vector files with sublayers ; add vector and raster test files with sublayers - * src/core/CMakeLists.txt, - src/core/qgscoordinatereferencesystem.cpp, - src/core/qgscrscache.cpp, src/core/qgscrscache.h, - src/mapserver/CMakeLists.txt, src/mapserver/qgsepsgcache.cpp, - src/mapserver/qgsepsgcache.h, src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgswmsserver.cpp: Use CRS cache for faster lookup of - crs by authid. Important especially for wms server. Replaces - wmsserver/epsgcache.cpp and .h +Juergen E. Fischer 2013-05-28 -2011-09-06 Marco Hugentobler + we don't have a file menu on osx either (followup c510c449) - * src/core/qgspallabeling.cpp: Add zero pointer checks to avoid - segfaults +Larry Shaffer 2013-05-27 -2011-09-05 pcav + Update QgsDataDefinedButton + + - Add 'Usage info' functions; displays in description and tool tip + - Reorganize menu, adding conceptual section titles + - Add ability to paste in expression + - Add ability to clear defined expression + - Add check for non-matching data field types + - Add better truncation of expressions in tool tip and menu - * : commit c2cf5cba11e9a0ee0bf5159c46433893c076c8ec Author: Marco - Hugentobler Date: Mon Sep 5 - 10:33:39 2011 +0200 +Sandro Santilli 2013-05-28 -2011-09-05 Marco Hugentobler + Fix leak of geometry in QgsSelectedFeature destructor - * src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h, - src/gui/symbology-ng/qgsrendererv2widget.cpp, - src/gui/symbology-ng/qgsrendererv2widget.h, - src/ui/qgsgraduatedsymbolrendererv2widget.ui: Move symbol change - slots to render widget parent class +Merge: 2fcb8b2 20c729a +Ivan Mincik 2013-05-28 -2011-09-02 Marco Hugentobler + Merge branch 'master' into slovak - * src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h, - src/ui/qgscategorizedsymbolrendererv2widget.ui: Use context menu to - set properties for multiple symbols in categorized renderer +Sandro Santilli 2013-05-28 -2011-09-05 pcav + Add a QgsDebugCall macro to trace entering/leaving functions + + Replace manual debugging lines used for the same purpose in a couple + of implementation files for node tool. - * i18n/qgis_it.ts: More consistency in WFS plugin IT translation +Juergen E. Fischer 2013-05-28 -2011-09-05 Martin Dobias + we don't have a file menu anymore (also moves project properties to project menu on windows) - * : Merge pull request #42 from rduivenvoorde/master trying out forking/pushing of qgis for dutch translations +Matthias Kuhn 2013-05-28 -2011-09-05 Richard Duivenvoorde + [diagrams] save attribute names instead of indices (fix #7914) - * i18n/qgis_nl.ts: some dutch translations for git testing +Nathan Woodrow 2013-05-28 -2011-09-03 Giuseppe Sucameli + Don't be so strict with bad geometies in spatial query - * python/plugins/GdalTools/tools/GdalTools_utils.py: make sure - gdaltools input vector layers are ogr vectors +Nathan Woodrow 2013-05-28 -2011-09-03 Nathan Woodrow + Load extents from geometry_columns. Fix #7883 - * src/gui/qgsexpressionbuilder.cpp, src/ui/qgslabelingguibase.ui: - Added more functions to function tree +Werner Macho 2013-05-27 -2011-09-03 Nathan Woodrow + translation update: sv by Victor - * src/ui/qgslabelingguibase.ui: Clean up labeling UI. Remove - borders from frames. +Merge: f4c859a e6e9139 +Werner Macho 2013-05-27 -2011-09-03 Nathan Woodrow + Merge pull request #615 from rduivenvoorde/nltranslation + + Dutch translation - * src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h, - src/ui/qgsexpressionbuilder.ui: UI clean up; Hide and show value - list when needed; handle field items better; code clean up. +Richard Duivenvoorde 2013-05-27 -2011-09-02 marco + addtion of Diethard to list of dutch translators - * src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsconfigparser.h, - src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp: - Output bounding boxes of wms groups in project CRS instead of WGS84 +Richard Duivenvoorde 2013-05-27 -2011-09-02 Werner Macho + further dutch translations - * i18n/qgis_nl.ts: translation update: nl by richard +Werner Macho 2013-05-27 -2011-09-01 Juergen E. Fischer + added flag for bengali language - * debian/changelog, debian/python-qgis.install.in, - src/core/qgsexpression.cpp: debian packaging update: include - pyspatialite +Werner Macho 2013-05-27 -2011-09-01 Martin Dobias + update and some changes to basque language - * src/providers/postgres/qgspostgresprovider.cpp: Shorter postgis - root data item +Werner Macho 2013-05-27 -2011-09-01 Marco Hugentobler + added more japanese translators - * src/core/qgsvectorlayer.cpp: Small efficiency improvement for - rendering +Merge: 7f4a7ac ab3c14c +Werner Macho 2013-05-27 -2011-08-31 Nathan + Merge pull request #612 from SrNetoChan/master + + pt_PT translations - * : Merge remote-tracking branch 'upstream/master' into - expression-labels-merge-wonder +Merge: 5177c7b f2e222b +Werner Macho 2013-05-27 -2011-08-30 Martin Dobias + Merge pull request #613 from qgis-jp/for_pull_from_ja + + translation gui ja by minoura , tmizu23, nuimura, Arctictern265, yoichi... - * : Merge remote-tracking branch 'remotes/giuseppe/dataitems' into - dataitems Conflicts: src/app/CMakeLists.txt +yoichigmf 2013-05-27 -2011-08-30 Martin Dobias + translation gui ja by minoura , tmizu23, nuimura, Arctictern265, yoichigmf - * cmake/Bison.cmake: Raised minimal Bison version to 2.4 (for - QgsExpression). Fixed bison version detection. +Juergen E. Fischer 2013-05-27 -2011-08-30 Marco Hugentobler + fix 10a91b7fb on some platforms - * : commit 6c0f56cc143687a0e3456e990b13cec4475d8122 Merge: 26aa007 - 03c13ad Author: Marco Hugentobler - Date: Tue Aug 30 16:28:45 2011 +0200 +Juergen E. Fischer 2013-05-26 -2011-08-30 Marco Hugentobler + indentation update - * src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Some cleanups for - line pattern code +Alexandre Neto 2013-05-26 -2011-08-30 marco + pt_PT Translations - * src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h: Check - topological editing yes/no when opening snapping dialog +Nyall Dawson 2013-05-26 -2011-08-30 Marco Hugentobler + Fix blending tests - * python/core/qgscomposeritem.sip, - src/core/composer/qgscomposeritem.cpp, - src/core/composer/qgscomposeritem.h, - src/core/composer/qgscomposermap.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.h, - src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.h, - src/gui/symbology-ng/qgssymbollayerv2widget.cpp, - src/gui/symbology-ng/qgssymbollayerv2widget.h, - src/ui/symbollayer/widget_linepatternfill.ui: [FEATURE]: offset for - line pattern symbols +Giuseppe Sucameli 2013-05-27 -2011-08-30 marco + do not destroy layers created outside the dialog (fix #7903) - * src/mapserver/qgswmsserver.cpp: Fix feature_count consideration in - wms feature info +Giuseppe Sucameli 2013-05-27 -2011-08-30 marco + DBManager: fix 'Update Option' button behaviour (fix #7606) - * src/mapserver/qgsprojectparser.cpp: Small typo in comment +Giuseppe Sucameli 2013-05-27 -2011-08-29 marco + DBManager: replace the deprecated Exception.message attribute - * src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgsprojectparser.h: Add available crs and extent also - for project toplevel groups +Giuseppe Sucameli 2013-05-27 -2011-08-29 Martin Dobias + DBManager: better handle for not supported constraint types (fix #7544) - * src/core/qgsexpression.cpp: Fix #4229 +Merge: 0f13260 3c0ac0d +Werner Macho 2013-05-26 -2011-08-29 Martin Dobias + Merge pull request #609 from SrNetoChan/master + + DB Manager Dialog pt_PT translations - * src/core/qgsexpression.cpp: Fixed a segfault when a function has - no arguments +Juergen E. Fischer 2013-05-26 -2011-08-29 Juergen E. Fischer + fix #7907 - * CMakeLists.txt, cmake/FindQwt.cmake, debian/rules, - src/app/CMakeLists.txt: depends on CMake >=2.6.2 and drop support - for lenny (debian oldstable) +Juergen E. Fischer 2013-05-26 -2011-08-29 Juergen E. Fischer + only catch signals on linux (fixes #7908) - * src/core/qgsexpressionlexer.ll: fix build error +Juergen E. Fischer 2013-05-26 -2011-08-27 Martin Dobias + Restore 'New Shapefile' (it's also used in the toolbar). + + This reverts commit ebd76d1a6478457e5f2c7c8970b39f45f7272429. - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp: Fixed build - error +Juergen E. Fischer 2013-05-26 -2011-08-27 Werner Macho + fix #7902 - * : commit a0b8e3c9e9a9f739a8a39b420b216e3fce698d1e Author: Werner - Macho Date: Sat Aug 27 12:56:35 2011 +0200 +Juergen E. Fischer 2013-05-26 -2011-08-27 Martin Dobias + fix #7901 - * : commit 260bf0c139b94582368329e64f2936b6118f5af3 Author: Borys - Jurgiel Date: Fri Aug 26 23:01:38 2011 - +0200 +Juergen E. Fischer 2013-05-26 -2011-08-25 Borys Jurgiel + postgres provider: use INT_MIN for unknown srid (fixes #7889) - * python/plugins/plugin_installer/installer_gui.py: Fix - QTreeWidget.resizeColumnToContents() issue observed in PyQt4.8.3 @ - Debian +Chris Crook 2013-05-26 -2011-08-22 Jaka Kranjc + Fix to handling of double precision values, and improved test cases for this - * src/core/symbology-ng/qgssymbollayerv2utils.cpp, - src/core/symbology-ng/qgssymbollayerv2utils.h, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp, - src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h: - symbology-ng: sort the category items when classifying them #4206 +Nathan Woodrow 2013-05-26 -2011-08-26 Marco Bernasocchi + Show selected CRS. Fix #5563 - * cmake/FindPostgres.cmake: If on android force POSTGRES_INCLUDE_DIR - and POSTGRES_LIBRARY, needs to be bette but works +Marco Hugentobler 2013-05-25 -2011-08-26 Marco Hugentobler + Allow smaller minimum for composer snap grid (ticket #7839) - * src/mapserver/qgswmsserver.cpp: Add non-default port numbers to - GetMap and GetFeatureInfo urls +Juergen E. Fischer 2013-05-25 -2011-08-24 Juergen E. Fischer + postgres provider fixes: + - allow selection of rows with srid 0 (fixes #7889) + - fix geometry type assignment of geometry less tables + - filter out geometry columns with srids < 0 in browser - * i18n/qgis_de.ts: german translation fix +Juergen E. Fischer 2013-05-25 -2011-08-24 marco + german translation update - * src/app/legend/qgslegend.cpp: Fix italic font when loading - embedded layers from project. Fixes ticket #4207 +Juergen E. Fischer 2013-05-25 -2011-08-24 Marco Bernasocchi + legend updates: + - when enabling explicit drawing order, intially take legend order + - when loading projects with explicit drawing order enabled, + verify that the order is actually fully set and take legend + order otherwise (fixes #7623) + - store/restore active layer - * src/providers/ogr/qgsogrprovider.cpp: temporary hack to get half - working shp suport. opening of a file works, writing only if there - are no string type attributes. +Juergen E. Fischer 2013-05-25 -2011-08-23 Juergen E. Fischer + fix #7827 - * debian/changelog, debian/compat.oneiric, debian/control.oneiric, - debian/rules: add ubuntu oneiric to debian packaging +Giuseppe Sucameli 2013-05-25 -2011-08-23 Giuseppe Sucameli + fix pyspatialite import running QGIS from output dir (fix #7899) - * src/providers/postgres/qgspostgresprovider.cpp: fix invalid - postgres type when converting field, removed some commented and - unused code +Marco Hugentobler 2013-05-25 -2011-08-23 Giuseppe Sucameli + Fix width of line decoration (ticket #7410) - * : commit bc09ab3539d1aadb69f7714909e997c570075656 Author: Giuseppe - Sucameli Date: Tue Aug 23 19:39:40 2011 - +0200 +Juergen E. Fischer 2013-05-25 -2011-08-18 Giuseppe Sucameli + german translation update - * src/providers/ogr/qgsogrprovider.cpp, - src/providers/ogr/qgsogrprovider.h: Implement import layer feature - for OGR provider using QgsVectorFileWriter +Juergen E. Fischer 2013-05-25 -2011-08-18 Giuseppe Sucameli + fix #4470 and #7889 - * src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: [FEATURE] Allow to - import a vector layer from canvas to SL database +Larry Shaffer 2013-05-22 -2011-08-18 Giuseppe Sucameli + Fix for label buffer drawing triggered off of just its data defined size in the past (<2.0) - * python/core/qgsproviderregistry.sip, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: convert the primary - key type name to a PG valid one, add a new options param to - importVector +Larry Shaffer 2013-05-24 -2011-08-14 Giuseppe Sucameli + Fix init flag order in QgsOptionsDialogBase (thanks Borys) - * python/core/qgsproviderregistry.sip, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: [FEATURE] import a - layer from canvas into a PG database - -2011-08-23 Marco Bernasocchi - - * src/core/CMakeLists.txt: adding support for spatialite - -2011-08-22 Marco Bernasocchi - - * src/core/spatialite/spatialite.c: fixing internal spatialite for - android - -2011-08-22 Martin Dobias - - * src/app/qgsdecorationcopyright.cpp, - src/app/qgsdecorationnortharrow.cpp, - src/app/qgsdecorationscalebar.cpp: Decorations are turned off by - default - -2011-08-22 Juergen E. Fischer - - * i18n/qgis_de.ts, scripts/update_ts_files.sh: german translation - update - -2011-08-22 Juergen E. Fischer - - * debian/qgis.install: debian packaging update - -2011-08-21 Martin Dobias - - * resources/context_help/QgsCopyrightLabelPluginGui-de_DE, - resources/context_help/QgsCopyrightLabelPluginGui-en_US, - resources/context_help/QgsCopyrightLabelPluginGui-es_ES, - resources/context_help/QgsCopyrightLabelPluginGui-fr_FR, - resources/context_help/QgsCopyrightLabelPluginGui-it_IT, - resources/context_help/QgsCopyrightLabelPluginGui-ja_JP, - resources/context_help/QgsCopyrightLabelPluginGui-pl_PL, - resources/context_help/QgsCopyrightLabelPluginGui-pt_BR, - resources/context_help/QgsCopyrightLabelPluginGui-ru_RU, - resources/context_help/QgsCopyrightLabelPluginGui-sk_SK, - resources/context_help/QgsCopyrightLabelPluginGui-sv_SE, - resources/context_help/QgsDecorationCopyrightDialog-de_DE, - resources/context_help/QgsDecorationCopyrightDialog-en_US, - resources/context_help/QgsDecorationCopyrightDialog-es_ES, - resources/context_help/QgsDecorationCopyrightDialog-fr_FR, - resources/context_help/QgsDecorationCopyrightDialog-it_IT, - resources/context_help/QgsDecorationCopyrightDialog-ja_JP, - resources/context_help/QgsDecorationCopyrightDialog-pl_PL, - resources/context_help/QgsDecorationCopyrightDialog-pt_BR, - resources/context_help/QgsDecorationCopyrightDialog-ru_RU, - resources/context_help/QgsDecorationCopyrightDialog-sk_SK, - resources/context_help/QgsDecorationCopyrightDialog-sv_SE, - resources/context_help/QgsDecorationNorthArrowDialog-de_DE, - resources/context_help/QgsDecorationNorthArrowDialog-en_US, - resources/context_help/QgsDecorationNorthArrowDialog-fr_FR, - resources/context_help/QgsDecorationNorthArrowDialog-it_IT, - resources/context_help/QgsDecorationNorthArrowDialog-ja_JP, - resources/context_help/QgsDecorationNorthArrowDialog-pt_BR, - resources/context_help/QgsDecorationScaleBarDialog-de_DE, - resources/context_help/QgsDecorationScaleBarDialog-en_US, - resources/context_help/QgsDecorationScaleBarDialog-es_ES, - resources/context_help/QgsDecorationScaleBarDialog-fr_FR, - resources/context_help/QgsDecorationScaleBarDialog-it_IT, - resources/context_help/QgsDecorationScaleBarDialog-ja_JP, - resources/context_help/QgsDecorationScaleBarDialog-pl_PL, - resources/context_help/QgsDecorationScaleBarDialog-pt_BR, - resources/context_help/QgsNorthArrowPluginGui-de_DE, - resources/context_help/QgsNorthArrowPluginGui-en_US, - resources/context_help/QgsNorthArrowPluginGui-fr_FR, - resources/context_help/QgsNorthArrowPluginGui-it_IT, - resources/context_help/QgsNorthArrowPluginGui-ja_JP, - resources/context_help/QgsNorthArrowPluginGui-pt_BR, - resources/context_help/QgsScaleBarPluginGui-de_DE, - resources/context_help/QgsScaleBarPluginGui-en_US, - resources/context_help/QgsScaleBarPluginGui-es_ES, - resources/context_help/QgsScaleBarPluginGui-fr_FR, - resources/context_help/QgsScaleBarPluginGui-it_IT, - resources/context_help/QgsScaleBarPluginGui-ja_JP, - resources/context_help/QgsScaleBarPluginGui-pl_PL, - resources/context_help/QgsScaleBarPluginGui-pt_BR: Renamed context - help files for decorations - -2011-08-21 Martin Dobias - - * images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgsdecorationscalebar.cpp, - src/app/qgsdecorationscalebar.h, - src/app/qgsdecorationscalebardialog.cpp, - src/app/qgsdecorationscalebardialog.h, src/plugins/CMakeLists.txt, - src/plugins/scale_bar/CMakeLists.txt, - src/plugins/scale_bar/plugin.cpp, src/plugins/scale_bar/plugin.h, - src/plugins/scale_bar/plugingui.cpp, - src/plugins/scale_bar/plugingui.h, - src/plugins/scale_bar/pluginguibase.ui, - src/plugins/scale_bar/scale_bar.svg, - src/plugins/scale_bar/scalebar_plugin.qrc, src/ui/qgisapp.ui, - src/ui/qgsdecorationscalebardialog.ui: Moved scale bar plugin to app - -2011-08-21 Martin Dobias - - * images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgsdecorationnortharrow.cpp, - src/app/qgsdecorationnortharrow.h, - src/app/qgsdecorationnortharrowdialog.cpp, - src/app/qgsdecorationnortharrowdialog.h, - src/plugins/CMakeLists.txt, src/plugins/north_arrow/CMakeLists.txt, - src/plugins/north_arrow/README, - src/plugins/north_arrow/north_arrow.svg, - src/plugins/north_arrow/northarrow_plugin.qrc, - src/plugins/north_arrow/plugin.cpp, - src/plugins/north_arrow/plugin.h, - src/plugins/north_arrow/plugingui.cpp, - src/plugins/north_arrow/plugingui.h, - src/plugins/north_arrow/pluginguibase.ui, src/ui/qgisapp.ui, - src/ui/qgsdecorationnortharrowdialog.ui: Moved north arrow plugin to - app - -2011-08-20 Martin Dobias - - * images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp, - src/app/qgisapp.h, src/app/qgsdecorationcopyright.cpp, - src/app/qgsdecorationcopyright.h, - src/app/qgsdecorationcopyrightdialog.cpp, - src/app/qgsdecorationcopyrightdialog.h, src/plugins/CMakeLists.txt, - src/plugins/copyright_label/CMakeLists.txt, - src/plugins/copyright_label/README, - src/plugins/copyright_label/copyright.svg, - src/plugins/copyright_label/copyright_plugin.qrc, - src/plugins/copyright_label/plugin.cpp, - src/plugins/copyright_label/plugin.h, - src/plugins/copyright_label/plugingui.cpp, - src/plugins/copyright_label/plugingui.h, - src/plugins/copyright_label/pluginguibase.ui, - src/ui/CMakeLists.txt, src/ui/qgisapp.ui, - src/ui/qgsdecorationcopyrightdialog.ui: Moved copyright label plugin - to app - -2011-08-22 NathanW - - * src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp: Update - usage of QgsSearchString to QgsExpression - -2011-08-21 Marco Bernasocchi - - * src/gui/qgsmapcanvas.cpp: fixing black canvas issue - -2011-08-21 NathanW - - * : Merge remote branch 'wonder/expr' into - expression-labels-merge-wonder - -2011-08-20 Alexander Bruy - - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/resources.qrc: new nice icon for Extract - projection tool. Thanks, Robert! - -2011-08-19 Martin Dobias +Salvatore Larosa 2013-05-25 - * src/core/qgsexpression.h: Some more comments for QgsExpression + [pyqgis-console] changes and cleans up some icon -2011-08-19 Martin Dobias +Chris Crook 2013-05-25 - * src/core/qgsexpression.cpp: Made strings translatable, made some - functions static + Adding CSVT file reading - using CSVT file alongside data file to determine field types -2011-08-19 Marco Hugentobler +Marco Hugentobler 2013-05-24 - * src/core/symbology-ng/qgsrendererv2.cpp, - src/core/symbology-ng/qgsrendererv2.h, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp, - src/gui/symbology-ng/qgsrendererv2propertiesdialog.h, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.h, - src/ui/qgsrulebasedrendererv2widget.ui: Merge patch for symbollevels - in rule based renderer also to master (patch provided by Mayeul - Kauffmann) + Delete rubberband if deactivating capture tool -2011-08-19 Marco Bernasocchi +SrNetoChan 2013-05-24 - * CMakeLists.txt, src/app/CMakeLists.txt, src/app/main.cpp, - src/app/qtmain_android.cpp: adding support fo share folder + DB Manager pt_PT translations -2011-08-18 Martin Dobias +Matthias Kuhn 2013-05-24 - * : Merge pull request #37 from NathanW2/identify-patch Move setting of projection to after we have features for identify - feature tool. + [Fix #7892] Fields properties: Fix sorting by id (numeric) -2011-08-18 Giuseppe Sucameli +Matthias Kuhn 2013-05-24 - * src/providers/spatialite/qgsspatialiteprovider.cpp, - src/providers/spatialite/qgsspatialiteprovider.h: [FEATURE] Allow to - import a vector layer from canvas to SL database + [Fix #7867] Fix field properties config dialog -2011-08-18 Giuseppe Sucameli +nyalldawson 2013-05-24 - * python/core/qgsproviderregistry.sip, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: convert the primary - key type name to a PG valid one, add a new options param to - importVector + Fix crash with render caching and feature blending combination -2011-08-18 Marco Hugentobler +Matthias Kuhn 2013-05-24 - * : commit 0c8695ccc38865b5145ac09a53f0d5f07b2c6451 Author: Marco - Hugentobler Date: Thu Aug 18 - 15:45:22 2011 +0200 + Add ownership management to the MapLayerRegistry -2011-08-18 Marco Hugentobler +pcav 2013-05-24 - * src/mapserver/qgsprojectparser.cpp, - src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: - [FEATURE]: possibility to select features in QGIS server by - layername / id in GetMap and GetPrint + Miro edits to IT GUI -2011-08-17 Martin Dobias +Merge: 1902af5 0dcd9eb +mhugent 2013-05-23 - * src/providers/gdal/qgsgdalprovider.cpp, - src/providers/ogr/qgsogrprovider.cpp: Close gdal/ogr data sources - when finished in dataItems implementation + Merge pull request #586 from vinayan/offlineedit + + Fix Offline Editing Plugin -2011-08-13 Martin Dobias +Merge: 2c55326 6227475 +Chris Crook 2013-05-24 - * src/app/qgsbrowserdockwidget.cpp, src/browser/qgsbrowserbase.ui: - Browser: do not show header in tree view + Merge remote-tracking branch 'upstream/master' -2011-08-17 Marco Hugentobler +Chris Crook 2013-05-24 - * python/core/qgsmaplayer.sip: Add consts also to sip file for - QgsMapLayer + Improving test platform independence -2011-08-17 Marco Hugentobler +Werner Macho 2013-05-23 - * src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: Add - feature bounding box if called with filter and without I/J + translation update: sv by Victor -2011-08-15 William Kyngesburye +Merge: 83445af ebd76d1 +Tim Sutton 2013-05-23 - * mac/cmake/1qt.cmake.in: make sure qwt lib path updated + Merge pull request #608 from imincik/menu-cleanup + + Removing redundant 'New' keyword from 'Layer -> New' menu item. -2011-08-15 William Kyngesburye +Ivan Mincik 2013-05-23 - * cmake/FindQGIS.cmake: find qgis frameworks in /Library/Frameworks - first + Removing redundant 'New' keyword from 'Layer -> New' menu item. -2011-08-16 Marco Bernasocchi +Merge: f82cc12 bac09e9 +Salvatore Larosa 2013-05-23 - * .gitignore: ignore CMakeLists.txt.user + Merge pull request #607 from alexbruy/console-ui + + use checkable groupbox instead of separate checkboxes in console -2011-08-16 Marco Bernasocchi +Ivan Mincik 2013-05-23 - * src/app/main.cpp, src/app/qtmain_android.cpp: added debug messages + Updating Slovak translation strings file. -2011-08-15 Marco Bernasocchi +Juergen E. Fischer 2013-05-23 - * src/app/CMakeLists.txt, src/app/qtmain_android.cpp: readded - logging capabilities of qtmain_android + fix #7888 -2011-08-15 Marco Bernasocchi +Marco Hugentobler 2013-05-23 - * src/app/CMakeLists.txt: fixed double declaration of - qtmain_android.cpp + Scale/diameter scale also for svg marker -2011-08-15 Marco Bernasocchi +Marco Hugentobler 2013-05-23 - * src/app/qtmain_android.cpp: uncommenting __android_log_print + Fix #7866 -2011-08-15 Marco Bernasocchi +Alexander Bruy 2013-05-23 - * src/app/CMakeLists.txt, src/app/qtmain_android.cpp: added - qtmain_android + use checkable groupbox instead of separate checkboxes in console + settings -2011-08-14 marco +Merge: d50214b ce280f4 +Chris Crook 2013-05-23 - * src/core/symbology-ng/qgsellipsesymbollayerv2.cpp: Set ellipse - renderer outline as float. Fix for ticket #4171 + Merge pull request #606 from ccrook/master + + Updating authors -2011-08-14 Giuseppe Sucameli +Chris Crook 2013-05-23 - * python/core/qgsproviderregistry.sip, - src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h, - src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: [FEATURE] import a - layer from canvas into a PG database + Updating AUTHORS -2011-08-14 Alexander Bruy +Merge: ac9736b 700d12f +mhugent 2013-05-23 - * python/plugins/GdalTools/tools/doExtractProj.py: fix #4170 + Merge pull request #604 from matthias-kuhn/wmsfix + + Fix bad WMS server performance -2011-08-13 Juergen E. Fischer +Merge: 64ab894 7ea8610 +Werner Macho 2013-05-22 - * debian/control.sid: another debian packaging fix: add - libqt4-opengl-dev build-dep - -2011-08-13 NathanW - - * src/app/qgsmaptoolidentify.cpp: Move setting projection to after - we have features - -2011-08-12 Martin Dobias - - * src/app/qgsbrowserdockwidget.cpp, src/gui/qgsmapcanvas.cpp, - src/gui/qgsmapcanvas.h: Browser: correct drag&drop for canvas and - browser itself - -2011-08-12 Juergen E. Fischer - - * debian/control: debian packageing: fix qwt dependency - -2011-08-12 Juergen E. Fischer - - * i18n/qgis_de.ts: german translation update - -2011-08-12 Steven Mizuno - - * src/app/gps/qgsgpsinformationwidget.cpp, - src/app/gps/qgsgpsinformationwidget.h, - src/app/gps/qgsgpsmarker.cpp, src/app/gps/qgsgpsmarker.h, - src/app/qgisapp.cpp, src/app/qgisapp.h, src/core/gps/nmeatime.h, - src/core/gps/parse.c, - src/core/gps/qextserialport/qextserialenumerator.h, - src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h, - src/core/gps/qgsgpsdetector.cpp, - src/core/gps/qgsnmeaconnection.cpp, src/core/gps/time.c, - src/ui/qgisapp.ui, src/ui/qgsgpsinformationwidgetbase.ui: GPS - tracking improvements (apply #4071) - -2011-08-12 Juergen E. Fischer - - * cmake/FindQwt.cmake, debian/control.sid, src/app/CMakeLists.txt, - src/app/gps/qgsgpsinformationwidget.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar.h, - src/app/gps/qwtpolar-0.1/qwt_polar_canvas.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_canvas.h, - src/app/gps/qwtpolar-0.1/qwt_polar_curve.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_curve.h, - src/app/gps/qwtpolar-0.1/qwt_polar_fitter.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_fitter.h, - src/app/gps/qwtpolar-0.1/qwt_polar_global.h, - src/app/gps/qwtpolar-0.1/qwt_polar_grid.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_grid.h, - src/app/gps/qwtpolar-0.1/qwt_polar_item.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_item.h, - src/app/gps/qwtpolar-0.1/qwt_polar_itemdict.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_itemdict.h, - src/app/gps/qwtpolar-0.1/qwt_polar_layout.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_layout.h, - src/app/gps/qwtpolar-0.1/qwt_polar_magnifier.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_magnifier.h, - src/app/gps/qwtpolar-0.1/qwt_polar_marker.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_marker.h, - src/app/gps/qwtpolar-0.1/qwt_polar_panner.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_panner.h, - src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_plot.h, - src/app/gps/qwtpolar-0.1/qwt_polar_point.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_point.h, - src/app/gps/qwtpolar-0.1/qwt_polar_spectrogram.cpp, - src/app/gps/qwtpolar-0.1/qwt_polar_spectrogram.h, - src/app/gps/qwtpolar-1.0/qwt_polar.h, - src/app/gps/qwtpolar-1.0/qwt_polar_canvas.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_canvas.h, - src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_curve.h, - src/app/gps/qwtpolar-1.0/qwt_polar_fitter.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_fitter.h, - src/app/gps/qwtpolar-1.0/qwt_polar_global.h, - src/app/gps/qwtpolar-1.0/qwt_polar_grid.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_grid.h, - src/app/gps/qwtpolar-1.0/qwt_polar_item.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_item.h, - src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.h, - src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_layout.h, - src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.h, - src/app/gps/qwtpolar-1.0/qwt_polar_marker.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_marker.h, - src/app/gps/qwtpolar-1.0/qwt_polar_panner.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_panner.h, - src/app/gps/qwtpolar-1.0/qwt_polar_picker.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_picker.h, - src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_plot.h, - src/app/gps/qwtpolar-1.0/qwt_polar_renderer.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_renderer.h, - src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.cpp, - src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.h, - src/app/gps/qwtpolar/qwt_polar.h, - src/app/gps/qwtpolar/qwt_polar_canvas.cpp, - src/app/gps/qwtpolar/qwt_polar_canvas.h, - src/app/gps/qwtpolar/qwt_polar_curve.cpp, - src/app/gps/qwtpolar/qwt_polar_curve.h, - src/app/gps/qwtpolar/qwt_polar_fitter.cpp, - src/app/gps/qwtpolar/qwt_polar_fitter.h, - src/app/gps/qwtpolar/qwt_polar_global.h, - src/app/gps/qwtpolar/qwt_polar_grid.cpp, - src/app/gps/qwtpolar/qwt_polar_grid.h, - src/app/gps/qwtpolar/qwt_polar_item.cpp, - src/app/gps/qwtpolar/qwt_polar_item.h, - src/app/gps/qwtpolar/qwt_polar_itemdict.cpp, - src/app/gps/qwtpolar/qwt_polar_itemdict.h, - src/app/gps/qwtpolar/qwt_polar_layout.cpp, - src/app/gps/qwtpolar/qwt_polar_layout.h, - src/app/gps/qwtpolar/qwt_polar_magnifier.cpp, - src/app/gps/qwtpolar/qwt_polar_magnifier.h, - src/app/gps/qwtpolar/qwt_polar_marker.cpp, - src/app/gps/qwtpolar/qwt_polar_marker.h, - src/app/gps/qwtpolar/qwt_polar_panner.cpp, - src/app/gps/qwtpolar/qwt_polar_panner.h, - src/app/gps/qwtpolar/qwt_polar_plot.cpp, - src/app/gps/qwtpolar/qwt_polar_plot.h, - src/app/gps/qwtpolar/qwt_polar_point.cpp, - src/app/gps/qwtpolar/qwt_polar_point.h, - src/app/gps/qwtpolar/qwt_polar_spectrogram.cpp, - src/app/gps/qwtpolar/qwt_polar_spectrogram.h, - src/app/qgsrasterlayerproperties.cpp: add optional Qwt 6.0 support - (including QwtPolar 1.0) - -2011-08-12 Marco Hugentobler - - * src/app/qgsaddjoindialog.cpp, - src/app/qgsvectorlayerproperties.cpp: Show only provider fields as - join target candidates (ticket #4136) - -2011-08-11 Tim Sutton - - * : commit 2154a813e2827f2034fe2d3430e72c7ee6f3f21e Author: Martin - Dobias Date: Thu Aug 11 20:09:16 2011 +0200 - -2011-08-11 Martin Dobias - - * src/app/qgsfieldcalculator.cpp: toint, toreal, tostring in - QgsExpression do not include space - -2011-08-11 Martin Dobias - - * python/core/symbology-ng-core.sip, - src/app/attributetable/qgsattributetabledialog.cpp, - src/app/qgsattributedialog.cpp, src/app/qgsfieldcalculator.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h, - src/gui/qgssearchquerybuilder.cpp, - src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp: Use - QgsExpression instead of QgsSearchString - -2011-08-11 Juergen E. Fischer - - * debian/changelog, debian/control.sid, - debian/libqgis{QGIS_ABI}.lintian-overrides, - debian/qgis-plugin-globe-common.install, - debian/qgis-plugin-globe.install, debian/qgis.install, debian/rules: - debian packaging update: include zonal statistics and globe plugins - -2011-08-11 Marco Bernasocchi - - * src/app/CMakeLists.txt: Adding support for generation of - libqgis.so - -2011-08-11 Marco Bernasocchi - - * src/app/CMakeLists.txt: added generation of libqgis_app.so + Merge pull request #605 from SrNetoChan/master + + Portuguese translations -2011-08-10 Tim Sutton +Merge: 37a30bb 6bd1b78 +Giuseppe Sucameli 2013-05-22 - * src/core/qgsapplication.cpp: Make gdal pam proxy env setting more - win friendly + Merge pull request #555 from olivierdalang/SaveSqlQueriesInDbManager + + [FEATURE] DBManager: allow to store SQL queries in the project file -2011-08-10 NathanW +Juergen E. Fischer 2013-05-22 - * src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.cpp: Fix - build issues + german translation fix -2011-08-10 NathanW +Merge: 2225108 3da0d7d +SrNetoChan 2013-05-22 - * src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp, - src/core/qgspallabeling.h, src/gui/qgsexpressionbuilder.cpp, - src/gui/qgsexpressionbuilder.h, src/ui/qgsexpressionbuilder.ui: - Update comments. Hide field value area + merge -2011-08-10 Tim Sutton +SrNetoChan 2013-05-22 - * : commit 89ddd03bdc6fb67ceaf575fa66fb72e221e5d536 Author: Tim - Sutton Date: Wed Aug 10 11:05:03 2011 +0200 + small correction to pt_PT Translation -2011-08-10 Marco Hugentobler +SrNetoChan 2013-05-22 - * src/mapserver/qgsconfigparser.cpp, - src/mapserver/qgsprojectparser.cpp: Add crs to wms project group - also if no crs constraint is there + Portuguese Translation -2011-08-09 Martin Dobias +SrNetoChan 2013-05-22 - * : Merge pull request #36 from spilth/master Shortcuts dialog now remembers window state between uses + Portuguese Translations -2011-08-09 Brian Kelly +Matthias Kuhn 2013-05-22 - * src/app/qgsconfigureshortcutsdialog.cpp, - src/app/qgsconfigureshortcutsdialog.h: Shortcuts dialog now - remembers window state between uses + Fix bad WMS server performance -2011-08-10 Martin Dobias +Salvatore Larosa 2013-05-22 - * src/core/qgsexpression.cpp, tests/src/core/testqgsexpression.cpp: - Improved handling of types in expressions: - implicit conversions to string / int / number / TVL - error reporting on conversion errors - automatic conversion to numeric values for arithmetic operators - try to use numeric comparison by default, fallback to string - comparison - functions do not need to explicitly care about NULL passed as an - argument + [pyqgis-console] fix for save as in tabbar context menu -2011-08-09 Tim Sutton +Salvatore Larosa 2013-05-22 - * src/providers/gdal/qgsgdalprovider.cpp: [FEATURE]. Retroactive - added feature tag to this commit to mark the fact that we now use - native provider stats gathering. Updated min max calculation of gdal - provider with more efficient implementation. Use updated stats - gathering routine kindly provided by Etienne Sky. + [pyqgis-console] enables to select multiple files to load in the file editor -2011-08-09 Martin Dobias +Matthias Kuhn 2013-05-22 - * python/core/core.sip, python/core/qgsexpression.sip, - src/core/qgsexpression.h: Added python bindings for QgsExpression + QgsExpression takes const QgsFeature as pointer and by reference -2011-08-09 Martin Dobias +SrNetoChan 2013-05-22 - * src/core/qgsexpression.cpp: Handle division by zero + Portuguese Translation -2011-08-09 Alexander Bruy +SrNetoChan 2013-05-22 - * python/plugins/GdalTools/GdalTools.py: move Near black close to - Sieve (fix #4152) + Portuguese Translations -2011-08-09 Juergen E. Fischer +Werner Macho 2013-05-22 - * cmake/PythonMacros.cmake, python/CMakeLists.txt: fix another cmake - <2.8 issue (followup to f3d5387edb309935c956acda6ae5e1f52523286c) + translation updates for da and gl -2011-08-09 Alexander Bruy +Juergen E. Fischer 2013-05-22 - * python/plugins/GdalTools/GdalTools.py, - python/plugins/GdalTools/resources.qrc, - python/plugins/GdalTools/tools/dialogExtractProjection.ui, - python/plugins/GdalTools/tools/doExtractProj.py: [FEATURE] Extract - projection tool for GdalTools + introduce MAPSERVER_SKIP_ECW setting to disable ECW support in mapserver -2011-08-09 Alexander Bruy +Juergen E. Fischer 2013-05-22 - * python/plugins/GdalTools/GdalTools.py: organize GdalTools - utilities into submenus for better usability + reduce debugging noise in pal labeling -2011-08-09 marco +Merge: 3306c7c e741ec9 +Nathan Woodrow 2013-05-22 - * src/app/legend/qgslegend.cpp: Consider identify disabled layers in - embedded projects + Merge pull request #602 from 3nids/selectall + + add selectall features method for vector layers -2011-08-08 Marco Hugentobler +Denis Rouzaud 2013-05-22 - * src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.h, - src/core/symbology-ng/qgssymbollayerv2.cpp, - src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Differentiate - between image angle and line pattern angle. Fixes rotation problem + add select all features methods for vector layers -2011-08-08 NathanW +Merge: b7f1987 6af9261 +Nathan Woodrow 2013-05-22 - * src/ui/qgslabelingguibase.ui: Resolve merge conflict + Merge pull request #601 from matthias-kuhn/qgsexpression-unprepared + + Allow unprepared execution of QgsExpression -2011-08-08 NathanW +Matthias Kuhn 2013-05-22 - * : Merge remote branch 'upstream/master' into expression-labels Conflicts: src/core/qgspallabeling.cpp src/gui/CMakeLists.txt src/ui/qgslabelingguibase.ui + Allow unprepared execution of QgsExpression -2011-08-07 Martin Dobias +Matthias Kuhn 2013-05-22 - * src/core/CMakeLists.txt, src/core/qgsexpression.cpp, - src/core/qgsexpression.h, src/core/qgsexpressionlexer.ll, - src/core/qgsexpressionparser.yy, tests/src/core/CMakeLists.txt, - tests/src/core/testqgsexpression.cpp: [FEATURE] new QgsExpression - class that replaces QgsSearchString The new class fixes various flaws in search strings: - fixed and simplified grammar in parser - simplified lexer - only one evaluation routine (instead of separate - getValue/checkAgainst) - SQL compliant three-value logic (true, false, unknown) - correct error handling - easily extensible list of functions, saner evaluation of - expressions - tests included + [Fix #7877] Crash when saving layer style as qml -2011-08-07 Martin Dobias +Juergen E. Fischer 2013-05-22 - * tests/src/core/CMakeLists.txt: Do not install tests, keep their - default RPATH settings + yet another german translation update -2011-08-07 Tim Sutton +Merge: 2acea9f 83eff76 +Jürgen Fischer 2013-05-21 - * INSTALL, doc/INSTALL.html, doc/linux.t2t: [BACKPORT] fix error in - notes reported to me by Marco Braida + Merge pull request #600 from slarosa/master + + Update translation script -2011-08-06 Tim Sutton +Juergen E. Fischer 2013-05-22 - * : Merge pull request #35 from - NathanW2/reduce-attribute-dialog-margins Reduced margins on controls in dialog. Removed frame from scroll - area + fix #7853 -2011-08-04 Werner Macho +Salvatore Larosa 2013-05-22 - * src/gui/qgsprojectionselector.cpp: Bugfix #4113 and #2805 thanks - to Jan Schreiber + update script for translation files -2011-08-04 Martin Dobias +Salvatore Larosa 2013-05-22 - * python/core/qgsvectorfilewriter.sip, - src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h: - Avoid a segfault when NULL layer is passed to vector writer + [pyqgis-console] small fixes -2011-08-04 Alexander Bruy +Salvatore Larosa 2013-05-21 - * python/plugins/fTools/tools/frmRandPoints.ui: [BACKPORT] increase - maximum points count in Random Points tool + [pyqgis-console] increases height of the row in QListView and QTreeWidget for Windows OS + - small fixes for the run script command -2011-08-04 Tim Sutton +Larry Shaffer 2013-05-21 - * CODING, INSTALL, doc/INSTALL.html, - src/app/qgsrasterlayerproperties.cpp, src/core/qgsapplication.cpp, - src/core/qgsapplication.h, src/core/qgsrasterdataprovider.cpp, - src/core/qgsrasterdataprovider.h, - src/core/raster/qgspseudocolorshader.cpp, - src/core/raster/qgsrasterlayer.cpp, - src/providers/gdal/qgsgdalprovider.cpp, - src/providers/gdal/qgsgdalprovider.h, - tests/src/core/testqgsapplication.cpp, - tests/src/core/testqgsrasterlayer.cpp, - tests/testdata/landsat_875.qml: Regenerated docs post raster-stats - merge + Update Mac INSTALL notes + + - Fix registered copyright symbol in .t2t files -2011-08-03 Juergen E. Fischer +Juergen E. Fischer 2013-05-21 - * i18n/qgis_de.ts, - src/plugins/globe/globe_plugin_dialog_guibase.ui, - src/ui/qgslabelingguibase.ui: german translation update (with some - additional fixes) + enable/disable layer dependant actions: + - select by expression requires active layer + - labeling requires and active vector layer -2011-08-03 Juergen E. Fischer +Juergen E. Fischer 2013-05-21 - * src/app/qgisapp.cpp, src/app/qgisapp.h: [BACKPORT] port qgis - version check to network access manager/qgis.org + german translation update -2011-08-03 Juergen E. Fischer +Juergen E. Fischer 2013-05-21 - * src/providers/postgres/qgspostgresprovider.cpp, - src/providers/postgres/qgspostgresprovider.h: slightly better - solution for recovering broken postgres connections + expression translation fixes -2011-08-03 Marco Hugentobler +D'Hont René-Luc 2013-05-21 - * src/providers/postgres/qgspostgresprovider.cpp: Try to reopen - broken postgres connection + Debbuging NoGeometry support in QGIS WFS Server -2011-08-03 Marco Hugentobler +Merge: 70b6821 cbc014e +Jürgen Fischer 2013-05-21 - * src/core/composer/qgscomposeritem.cpp, - src/core/composer/qgscomposeritem.h: Remove duplicated code and - coding style improvements in composer item (provided as part of pull - request 33 by Rokemoon) + Merge pull request #598 from ccrook/master + + Adding missing delimited text data files -2011-08-02 Alexander Bruy +Chris Crook 2013-05-21 - * src/app/qgsrasterlayerproperties.cpp, - src/core/raster/qgsrasterlayer.cpp: [BACKPORT] set default contrast - enchacement algorithm to NoStretch (addresses #3867). Also set - default standard deviations value to 2.0 because this is more - appropriate value + Adding missing test data files -2011-08-01 Juergen E. Fischer +Nathan Woodrow 2013-05-21 - * src/analysis/raster/qgsrastermatrix.cpp, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp: fix windows build + Reduce margins in properties dialog -2011-07-31 marco +Salvatore Larosa 2013-05-20 - * src/mapserver/qgsprojectparser.cpp: Set wms groups always as - identifiable + [pyqgis-console] uses context menu to handle the command history instead of typing directly the command into the console + - shows history in dialog (much more usable) -2011-07-31 marco +Werner Macho 2013-05-20 - * src/mapserver/qgswmsserver.cpp: Enable feature info on layer - groups in wms server + adding new language Bengali on request -2011-07-30 Martin Dobias +Larry Shaffer 2013-05-20 - * src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h, - src/core/qgsbrowsermodel.cpp, src/core/qgsbrowsermodel.h: [FEATURE] - Add/remove favourite dirs in browser dock + Turn off buffer size-trigger fix for <2.0 projects until better solution is implemented -2011-07-29 Alexander Bruy +Larry Shaffer 2013-05-15 - * python/plugins/GdalTools/tools/widgetBatchBase.py: removed old - unused code + Update labeling gui and add expression support as data defined value + + - Add QgsDataDefined class + - Add QgsDataDefinedButton class + - Add data defined Python support + - Add standalone SVG selector dialog to QgsSvgSelectorWidget class + + - Fix for #4607, show only pertinent fields when setting a data defined value + - Fix for #5048 and #5049, data defined settings are literally used + - Fix for #5726, number formatting does not work for expressions + - Fix for #7755, using bufferSize to enable/disable label buffer is confusing + - Fix for #7779, labels do not register in label collision engine; and for #4719, inactive options in labeling dialog + - Prepare label text's expression upfront when preparing layer; makes rendering much faster + - Change name of 'feature obstacles' to appropriate terminology -2011-07-29 Alexander Bruy +Radim Blazek 2013-05-20 - * python/plugins/fTools/tools/doRandPoints.py: [BACKPORT]fix - RandomPoints crash when there are NULL values in attributes + raster identify - keep format above others -2011-07-29 Marco Bernasocchi +Juergen E. Fischer 2013-05-20 - * : commit f3d5387edb309935c956acda6ae5e1f52523286c Author: Juergen - E. Fischer Date: Fri Jul 29 01:33:46 2011 +0200 + - Quantum GIS => QGIS update + - integrate PythonConsole help into main translation + - allow referencing QGIS images in context help(viewer) -2011-07-29 Juergen E. Fischer +Juergen E. Fischer 2013-05-20 - * src/core/qgsapplication.h, - src/core/symbology-ng/qgsellipsesymbollayerv2.cpp, - src/core/symbology-ng/qgsellipsesymbollayerv2.h, - src/core/symbology-ng/qgsfillsymbollayerv2.cpp, - src/core/symbology-ng/qgssymbollayerv2registry.h: fix warnings + german translation update -2011-07-28 Martin Dobias +Salvatore Larosa 2013-05-20 - * src/app/qgisapp.cpp, src/app/qgsbrowserdockwidget.cpp: Allow - drag&drop with multiple files + [pyqgis-console] fix translation string -2011-07-28 Martin Dobias +Salvatore Larosa 2013-05-20 - * src/app/qgsbrowserdockwidget.cpp: Allow dragging files from - browser dock + [pyqgis-console] allow to disable automatic parentheses insertion from settings: + - fix: add Shift+Insert to paste action + - fix: set default Monospaced font at the first start + - allow to save state for console splitter + - fix for mousePressEvent into console -2011-07-28 Martin Dobias +Juergen E. Fischer 2013-05-20 - * images/images.qrc: Bring back locked/unlocked icons + fix some tests and some doxygen warnings -2011-07-28 marco +Juergen E. Fischer 2013-05-19 - * : [FEATURE]: Add point and line pattern symbol layers + german translation fix -2011-07-27 marco +Giuseppe Sucameli 2013-05-20 - * src/mapserver/qgsprojectparser.cpp: WMS layer: add CRS for project - layer group + gdaltools: move clipper dialog on top when the user ends to define a new extent (fix #7783) -2011-07-27 Marco Bernasocchi +Juergen E. Fischer 2013-05-19 - * CMakeLists.txt: revert to without with_gsl + debian packaging update for sid -2011-07-27 Marco Bernasocchi +Tim Sutton 2013-05-19 - * src/core/qgscoordinatetransform.cpp, - src/core/qgscoordinatetransform.h, src/core/qgsmaptopixel.cpp, - src/core/qgsmaptopixel.h, src/core/symbology-ng/qgsrendererv2.cpp: - fix for qreal - double problem when crosscompiling for android + Revert "make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android " + + This reverts commit f7f3e413b726024384235a3654d6b18d9ff073be. -2011-07-26 Juergen E. Fischer +Merge: 6370aa4 f7f3e41 +Tim Sutton 2013-05-19 - * src/core/qgspoint.h: initialize QgsPoint + Merge pull request #596 from mbernasocchi/master + + make cmake honor PYTHON_LIBRARY -2011-07-25 Martin Dobias +Marco Bernasocchi 2013-05-19 - * src/app/main.cpp: Remove the source build check that is not - necessary anymore. + make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android -2011-07-25 Martin Dobias +Nathan Woodrow 2013-05-19 - * CMakeLists.txt, i18n/CMakeLists.txt, python/CMakeLists.txt, - python/core/qgsapplication.sip, python/pyspatialite/CMakeLists.txt, - src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/crssync/CMakeLists.txt, src/helpviewer/CMakeLists.txt, - src/plugins/CMakeLists.txt, src/plugins/grass/CMakeLists.txt, - src/providers/CMakeLists.txt, src/providers/grass/CMakeLists.txt, - src/python/qgspythonutilsimpl.cpp: [FEATURE] Allow running QGIS from - build directory without installing + Expose alpha on raster colour dialog -2011-07-24 Martin Dobias +nyalldawson 2013-05-19 - * python/core/qgsapplication.sip, src/app/qgisapp.cpp, - src/core/qgsapplication.cpp, src/core/qgsapplication.h, - src/plugins/grass/qgsgrassmodule.cpp, - src/plugins/grass/qgsgrassshell.cpp, - src/plugins/grass/qgsgrasstools.cpp, - src/providers/grass/qgsgrass.cpp, - src/providers/grass/qgsgrassrasterprovider.cpp: Added libraryPath() - and libexecPath() to QgsApplication + Make sure classifying color ramps for rasters uses the full range of the ramp -2011-07-25 Marco Hugentobler +nyalldawson 2013-05-19 - * src/gui/qgscomposerview.cpp: Fix reversed show/hide signals + [feature] Transparency support for raster color ramps (fix #7847) -2011-07-25 Marco Bernasocchi +Tim Sutton 2013-05-19 - * CMakeLists.txt: making GSL and thus georeferences really optional - but ON by default + Revert "make cmake honor PYTHON_LIBRARY" + + This reverts commit b3c6d38ffefa9db79932be234b010598a9664706. -2011-07-25 Marco Bernasocchi +Merge: 2f9ccb5 b3c6d38 +Tim Sutton 2013-05-19 - * : commit 8c4cf8e063dbdb9ca3447b88690080841ba78409 Author: Marco - Bernasocchi Date: Mon Jul 25 14:45:31 - 2011 +0200 + Merge pull request #553 from mbernasocchi/myfix + + make cmake honor PYTHON_LIBRARY -2011-07-24 William Kyngesburye +Merge: acacf84 014729b +Werner Macho 2013-05-19 - * cmake/MacBundleMacros.cmake, mac/cmake/1qt.cmake.in: forgot to - detab files + Merge pull request #595 from Cracert/trans + + pl translation update -2011-07-24 William Kyngesburye +Salvatore Larosa 2013-05-19 - * cmake/MacBundleMacros.cmake, mac/CMakeLists.txt, - mac/cmake/0qgis.cmake.in, mac/cmake/0vars.cmake.in, - mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in, - mac/cmake/3fw.cmake.in: more mac bundling cleanup and streamlining + [pyqgis-console] adds more options to find text in the editor -2011-07-24 William Kyngesburye +Robert Szczepanek 2013-05-19 - * CMakeLists.txt: add missing Mac app setting + translation update: Polish by Milena, Robert, Borys -2011-07-24 William Kyngesburye +Merge: 81f677d c95dac5 +Werner Macho 2013-05-18 - * cmake/MacBundleMacros.cmake, mac/cmake/1qt.cmake.in: simplify - framework bundling, don't need to know fw version (always current) + Merge pull request #594 from tomass/master + + Updates to Lithuanian translations -2011-07-24 Martin Dobias +Tomas 2013-05-18 - * images/CMakeLists.txt, images/images.qrc, - images/north_arrows/CMakeLists.txt, - src/plugins/north_arrow/plugin.cpp, - src/plugins/north_arrow/plugingui.cpp: Include north arrow image in - the resources + Updates to Lithuanian translation -2011-07-22 Juergen E. Fischer +Giuseppe Sucameli 2013-05-18 - * src/providers/postgres/qgspostgresprovider.cpp: postgres provider: - also consider ltree columns + open project file using text mode (fix #7735) -2011-07-22 Juergen E. Fischer +Matthias Kuhn 2013-05-18 - * python/core/qgsvectorlayer.sip, - src/app/qgsattributetypedialog.cpp, src/core/qgsvectorlayer.cpp, - src/core/qgsvectorlayer.h, src/gui/qgsattributeeditor.cpp, - src/ui/qgsattributetypeedit.ui: [FEATURE] allow ordering of value - relations by value and include value relations in sip bindings + [Fix #7858] Toggle editing mode resets edit widget + And introduces full mapping between table row and field index ( Fix for loosing index mapping after sorting rows ) -2011-07-22 Juergen E. Fischer +Matthias Kuhn 2013-05-18 - * debian/qgis-plugin-grass-common.install, - debian/qgis-plugin-grass-common.install.lenny: remove themes from - grass plugin's debian package + [attrtable] Fix column synchronization + Columns have been missing, after removing all columns and readding them -2011-07-21 Marco Hugentobler +Matthias Kuhn 2013-05-18 - * src/mapserver/qgis_map_serv.cpp: WMS server: be more tolerant with - exotic WMS clients and accept requests without service parameters + [Fix #7849] Layer properties > fields delete correct field -2011-07-21 Marco Hugentobler +Juergen E. Fischer 2013-05-18 - * src/mapserver/qgshttprequesthandler.cpp: Replace + signs in wms - requests with spaces + translation update -2011-07-21 Marco Hugentobler +Juergen E. Fischer 2013-05-15 - * src/mapserver/qgswmsserver.cpp: Improve href url for capabilities - response + indentation update -2011-07-21 Marco Hugentobler +Juergen E. Fischer 2013-05-18 - * src/app/legend/qgslegend.cpp: Set visibility of layers for - embedded groups (ticket #4097) + debian packaging update -2011-07-21 Juergen E. Fischer +Larry Shaffer 2013-05-17 - * debian/qgis-plugin-grass-common.install, - debian/qgis-plugin-grass-common.install.lenny: update debian - packaging + Fix #7835, opening WMS layer properties causes crash -2011-07-21 Pirmin Kalberer +Matthias Kuhn 2013-05-17 - * src/plugins/globe/globe_plugin.cpp, - src/plugins/globe/globe_plugin_dialog.cpp: chmod -x *cpp + [attrtable] Make sure editor widget background is not transparent -2011-07-20 Martin Dobias +Matthias Kuhn 2013-05-17 - * images/CMakeLists.txt, images/images.qrc, - images/splash/CMakeLists.txt, src/core/qgsapplication.cpp: Include - splash file in resources + Small fixes + * Fix minor memory leak in attribute dialog + * Safety check in dual view -2011-07-20 Martin Dobias +Matthias Kuhn 2013-05-17 - * src/plugins/grass/CMakeLists.txt, - src/plugins/grass/qgsgrass_plugin.qrc, - src/plugins/grass/qgsgrassnewmapset.cpp: grass: install just one - world map (included in resource file) + [Fix #7806] Be more verbose in "invalid layer" dialog -2011-07-20 Martin Dobias +Matthias Kuhn 2013-05-17 - * src/plugins/grass/CMakeLists.txt, - src/plugins/grass/qgsgrass_plugin.qrc, - src/plugins/grass/themes/CMakeLists.txt, - src/plugins/grass/themes/classic/CMakeLists.txt, - src/plugins/grass/themes/default/CMakeLists.txt, - src/plugins/grass/themes/gis/CMakeLists.txt: grass: do not install - icon files, use them from the resource file + Fix wmsserver: Do not manipulate maplayerregistry directly -2011-07-20 Marco Hugentobler +nyalldawson 2013-05-17 - * src/mapserver/qgswmsserver.cpp: Add scheme (http or https) to - service urls in capabilities + Use a cosmetic pen for snap lines to prevent lines scaling (fix #7524) -2011-07-20 Juergen E. Fischer +Marco Hugentobler 2013-05-17 - * src/providers/wms/qgswmssourceselect.cpp, - src/ui/qgswmssourceselectbase.ui: [BACKPORT] fix #3974 + Fix generation of empty layer/style entries -2011-07-20 Juergen E. Fischer +Matthias Kuhn 2013-05-17 - * python/core/qgssearchtreenode.sip, - resources/context_help/QgsFieldCalculator-de_DE, - resources/context_help/QgsFieldCalculator-en_US, - src/app/qgsfieldcalculator.cpp, src/core/qgssearchstringlexer.ll, - src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: - [FEATURE] search string update - added regexp_replace operator - check types on comparison (QgsSearchTreeValue::compare now returns - QgsSearchTreeValue for error reporting) - field calculator shows expression errors. - update node types and operators in sip bindings + Disallow changing of map layer registry directly + QgsMapLayerRegistry::mapLayers() returned reference is now const -2011-07-20 Martin Dobias +Merge: 957c4f1 198cc39 +Tim Sutton 2013-05-17 - * src/core/symbology-ng/qgsrulebasedrendererv2.cpp, - src/core/symbology-ng/qgsrulebasedrendererv2.h: Rule-based renderer: - dump meaningful debugging info + Merge pull request #591 from ccrook/delimited_text_to_core + + Delimited text to core -2011-07-20 Martin Dobias +Merge: 7962361 cfaa71c +vinayan 2013-05-16 - * src/core/pal/internalexception.h, src/core/pal/layer.cpp, - src/core/pal/util.cpp: Fix #4088: better handling of unknown - geometry types + Merge pull request #593 from mach0/topocheck + + modified topology checker mostly GUI overhaul -2011-07-19 Tim Sutton +Nathan Woodrow 2013-05-17 - * : Merge pull request #32 from Jean-Roc/master update fr translation + Return rgba from ramp_color -2011-07-19 Jean-Roc Morreale +Nathan Woodrow 2013-05-17 - * i18n/qgis_fr.ts: update french translation + Add aplha to colour ramp -2011-07-19 Marco Hugentobler +Nathan Woodrow 2013-05-17 - * : Merge ellipse symbollayer branch + Return rgb from all colour functions -2011-07-19 Tim Sutton +Chris Crook 2013-05-17 - * src/core/gps/qgsgpsdconnection.cpp: Patch from Michal Klatecki - - see ticket #3325 + Fixing line spacing in 
 section of delimited text context help
 
-2011-07-19  Marco Hugentobler 
+Merge: 83b571b 2c7eff7
+Chris Crook 	2013-05-17
 
-	* src/mapserver/qgsprojectparser.cpp: Contact person and
-	organisation are mandatory in wms capabilities schema
+    Fix merge conflict
 
-2011-07-18  Marco Hugentobler 
+Werner Macho 	2013-05-14
 
-	* src/app/qgsprojectproperties.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/ui/qgsprojectpropertiesbase.ui: Add Service online resource
-	element to WMS capability response. This element is mandatory
-	according to the 1.3 spec
+    modified topology checker mostly GUI overhaul
 
-2011-07-19  Giuseppe Sucameli 
+Merge: 36bf93c b7ef48a
+mhugent 	2013-05-16
 
-	* src/ui/qgswmssourceselectbase.ui: move tooltip from the dialog to
-	the right button...
+    Merge pull request #592 from matthias-kuhn/fix-7405
+    
+    [Fix #7405] Graduated renderer: Feature count 0 with scale or rotation
 
-2011-07-18  Werner Macho 
+Radim Blazek 	2013-05-16
 
-	* i18n/qgis_et.ts: Adding estonian translation file
+    raster resampler fixes, use zoom in resampler also for oversampling 1
 
-2011-07-18  Giuseppe Sucameli 
+Juergen E. Fischer 	2013-05-16
 
-	* src/providers/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspgsourceselect.h,
-	src/providers/postgres/qgspostgresprovider.cpp: fix connection info
-	passed to QgsGeomColumnTypeThread broken in 6989fc7, hide close and
-	add buttons from PG source select dialog when in embedded mode (e.g.
-	qbrowser)
+    drop qgis_help.db and debian packaging update
 
-2011-07-18  Marco Hugentobler 
+Salvatore Larosa 	2013-05-16
 
-	* src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsprojectparser.cpp: Improve capabilities output for
-	layer groups. CRS and bounding box need to be listed before child
-	layers (wms capabilities schema 1.3)
+    [pyqgis-console] uses QFileInfo instead of os.path to check if file exists
+    - minor fixes and cleanup
 
-2011-07-18  Juergen E. Fischer 
+Radim Blazek 	2013-05-15
 
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h: ogr provider fix: apparently we
-	need to fetch the geometry to make the spatial filter stick.
+    fixed raster paletted renderer for no data, fixes #7139
 
-2011-07-18  Marco Hugentobler 
+Matthias Kuhn 	2013-05-15
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Implement point
-	marker displacement
+    [Fix #7405] Graduated renderer: Feature count 0 with scale or rotation
 
-2011-07-18  Marco Hugentobler 
+Radim Blazek 	2013-05-15
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Fix point marker
-	resolution
+    enabled resampling for wms, fixes #7144
 
-2011-07-18  Juergen E. Fischer 
+Radim Blazek 	2013-05-15
 
-	* resources/context_help/QgsFieldCalculator-de_DE,
-	resources/context_help/QgsFieldCalculator-en_US: fix typo in field
-	calculator context help
+    removed raster layer drawing style getter/setter
 
-2011-07-17  William Kyngesburye 
+Matthias Kuhn 	2013-05-15
 
-	* src/plugins/globe/CMakeLists.txt: osgearth gdal driver needs GEOS
-	headers
+    Revert "[qgis_help] Detect proper resource path when running from build dir"
+    
+    This reverts commit 30b9fedc6adff91be11183c3a1ee3338ac6e0afa.
+    
+    qgis_help doesn't need to know the install path any more, because it reads from stdin instead of directly opening files
 
-2011-07-17  Juergen E. Fischer 
+Radim Blazek 	2013-05-15
 
-	* images/icons/CMakeLists.txt, src/app/CMakeLists.txt: move qgis.ico
-	back to app
+    python console setPlaceholderText qt < 4.7 fix
 
-2011-07-17  Juergen E. Fischer 
+Salvatore Larosa 	2013-05-15
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix build problem
-	with Qt 4.4
+    [pyqgis-console] allow to disable the object inspector from settings (default it is disabled)
+    - fixes some translation string
 
-2011-07-15  Tim Sutton 
+Marco Hugentobler 	2013-05-15
 
-	* : Merge pull request #31 from gostrc/master Initial step for bug #3562 QGIS incompatible with QWT 6.0.0
+    Insert user defined OWS extent for project into top layer of WMS capabilities
 
-2011-07-15  Juergen E. Fischer 
+Radim Blazek 	2013-05-15
 
-	* i18n/qgis_de.ts: german translation update
+    disabled raster data file timestamp check in loading style, fixes #6900
 
-2011-07-15  Juergen E. Fischer 
+Marco Hugentobler 	2013-05-15
 
-	* src/app/qgisapp.cpp, src/app/qgsabout.cpp, src/ui/qgsabout.ui: fix
-	#4081
+    Invert layer crs if wms version is  not 1.1.1 (covers the case where wms version is given as 1.3 instead 1.3.0)
 
-2011-07-15  Marco Hugentobler 
+Juergen E. Fischer 	2013-05-15
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/ui/symbollayer/widget_pointpatternfill.ui: Started point pattern
-	fill renderer
+    - recover japanese translations lost in 4b76600
+    - german translation fix
 
-2011-07-15  Juergen E. Fischer 
+Nathan Woodrow 	2013-05-15
 
-	* src/app/composer/qgscomposer.cpp: fix #4024
+    Refactor activateDeactivateLayerRelatedActions
 
-2011-07-15  Juergen E. Fischer 
+Nathan Woodrow 	2013-05-15
 
-	* src/app/qgisapp.cpp: fix #4072
+    Add field calc to main app window
 
-2011-07-15  Juergen E. Fischer 
+Juergen E. Fischer 	2013-05-13
 
-	* src/app/attributetable/qgsattributetabledialog.cpp: fix #4084
+    - integrate function_help and context_help to translation files
+    - add some german function help updates
+    - update helpviewer to show help passed into stdin from qgis
 
-2011-07-15  Juergen E. Fischer 
+Radim Blazek 	2013-05-14
 
-	* src/gui/qgsfieldvalidator.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: [BACKPORT] fix #4089 - postgres provider: fix detection of field length and precision for
-	char and numeric fields.  - attribute editor: fix validation in case the field length is
-	unknown
+    skip raster nuller with color types; check data block allocation in block value read, fixes possibly #7807
 
-2011-07-15  Marco Hugentobler 
+D'Hont René-Luc 	2013-04-30
 
-	* src/ui/symbollayer/widget_linepatternfill.ui: Allow larger values
-	for line pattern width and distance
+    Activating WMS getStyle REQUEST for .qgs mapfile
+    
+    A getStyle REQUEST has been developped for SLD mapfile.
+    qgsVectorLayer has a method writeSld. It was easy to activate getStyle
+    for .qgsmapfile
 
-2011-07-15  Martin Dobias 
+D'Hont René-Luc 	2013-05-06
 
-	* src/core/qgspallabeling.cpp, src/core/qgspallabeling.h: Labeling:
-	clip geometries to current extent if they are not completely inside.
-	Also fixes #4083
+    Add image/png; mode=16bit as a supported format
 
-2011-07-14  Sandro Santilli 
+D'Hont René-Luc 	2013-05-14
 
-	* CMakeLists.txt: Run git in source tree, not build tree. Fixes bug
-	#4086.
+    Reactivated 8bit and 1bit mode for QGIS Server
+    
+    The commit 76d1f955c019c3d42cbab29ce2d147acd233b54a simplified the
+    mFormat private attribute to PNG, JPG, PDF, etc and created
+    mFormatString attribute. The second is used for base64 but not for mode.
+    This commit corrected it.
 
-2011-07-14  Tim Sutton 
+Juergen E. Fischer 	2013-05-14
 
-	* src/plugins/globe/qgsosgviewer.cpp: Mark var unused
+    postgres provider: fix b85af12c
 
-2011-07-14  Juergen E. Fischer 
+Juergen E. Fischer 	2013-05-14
 
-	* src/core/qgsproviderregistry.cpp, src/core/qgsvectorlayer.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: [FEATURE]
-	add configurable decimal "point" to delimited text plugin
+    postgres provider: avoid noise when layer_style table doesn't exist
 
-2011-07-14  Juergen E. Fischer 
+Victor Olaya 	2013-05-14
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.cpp: globe fix: don't crash on
-	quit
+    [sextante] fixed issue in GRASS installation test
 
-2011-07-13  Pirmin Kalberer 
+Chris Crook 	2013-05-14
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/qgsosgviewer.h: Fix more globe warnings
+    Delimited text plugin moved to core
 
-2011-07-13  Juergen E. Fischer 
+Chris Crook 	2013-05-14
 
-	* python/pyspatialite/CMakeLists.txt: pyspatialite: inhibit
-	warnings.
+    Minor gui fix
 
-2011-07-13  Juergen E. Fischer 
+Chris Crook 	2013-05-14
 
-	* src/plugins/globe/globe_plugin.cpp: oh well - missed _the_ file...
+    Delimited text GUI tidy up.  Renamed useWatcher option to watchFile
 
-2011-07-13  Juergen E. Fischer 
+nyalldawson 	2013-05-14
 
-	* src/plugins/globe/qgsosgearthtilesource.cpp: fix last commit
+    Add clamp and scale_exp functions
 
-2011-07-13  Juergen E. Fischer 
+Merge: 226c524 519fe2f
+Nathan Woodrow 	2013-05-13
 
-	* cmake/FindOSGEARTH.cmake, src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/WorldWindOptions,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h: globe plugin fixes: - implement a compile check to tell apart OSGEARTH 2.0 from 3.0 - fix warnings
+    Merge pull request #590 from nyalldawson/advanced_composition
+    
+    FFE? some blending fixes & composition feature requests
 
-2011-07-13  Marco Hugentobler 
+nyalldawson 	2013-05-13
 
-	* src/app/composer/qgscomposerlegendwidget.cpp: Better block for
-	signals when creating composer legend widget
+    Add python bindings and tests for grid blending, grid annotation font color, vector feature blending and vector layer transparency
 
-2011-07-13  NathanW 
+nyalldawson 	2013-05-13
 
-	* src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h,
-	src/ui/qgsexpressionbuilder.ui: Added support to show help about
-	selected function
+    Tests for grid blending, grid color labels, vector feature blending and vector layer transparency
 
-2011-07-13  Marco Hugentobler 
+nyalldawson 	2013-05-13
 
-	* src/core/composer/qgscomposerlegend.cpp: Fix for considering layer
-	title length in composer legend
+    [feature] Add font color control for grid annotations (fix #7789)
 
-2011-07-13  Pirmin Kalberer 
+nyalldawson 	2013-05-13
 
-	* : commit 36fb5a7a6b13fc981e45dda5df20f414047d2e55 Author: Pirmin
-	Kalberer  Date:   Wed Jul 13 09:36:10 2011 +0200
+    [feature] blend modes for composer map grids (fix #7777)
 
-2011-07-13  Juergen E. Fischer 
+nyalldawson 	2013-05-13
 
-	* src/app/composer/qgscomposeritemwidget.cpp,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp, src/core/qgsproject.h,
-	src/core/spatialindex/include/RTree.h,
-	src/core/spatialindex/include/SpatialIndex.h,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgspostrequesthandler.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.h,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h: indentation update
+    [feature] Layer transparency for vectors (fix #7692)
 
-2011-07-13  Juergen E. Fischer 
+nyalldawson 	2013-05-13
 
-	* src/core/qgsbrowsermodel.cpp: fix vc build
+    Add blend mode option for features, allows blending to be used between features in a layer
 
-2011-07-13  Pirmin Kalberer 
+Nathan Woodrow 	2013-05-14
 
-	* : commit 540fb7a1b7a06e2bd03616b288a81675ba83cb59 Author: Pirmin
-	Kalberer  Date:   Wed Jul 13 01:11:47 2011 +0200
+    Fix build error
 
-2011-07-12  Martin Dobias 
+Victor Olaya 	2013-05-13
 
-	* src/browser/qgsbrowser.cpp, src/browser/qgsbrowser.h,
-	src/core/qgsbrowsermodel.cpp, src/core/qgsbrowsermodel.h,
-	src/core/qgsdataitem.h: Added home directory to the browser model.
-	Unified method to find an index for a path
+    [sextante] cleaned some unnecessary code from last commit
 
-2011-07-12  Tim Sutton 
+Victor Olaya 	2013-05-13
 
-	* src/plugins/globe/globe_plugin.cpp: Commented out lines causing
-	build errors on my Qt 4.4.7 setup
+    [sextante] improved modeler appearance with Bezier curves
 
-2011-07-12  Giuseppe Sucameli 
+Salvatore Larosa 	2013-05-13
 
-	* src/app/CMakeLists.txt: fix cmakelists by removing files moved in
-	bd3f77a
+    [pyqgis-console] again more fixes and cleanup (for the editor)
 
-2011-07-12  Giuseppe Sucameli 
+Werner Macho 	2013-05-13
 
-	* src/providers/postgres/qgspgsourceselect.cpp: use the provider to
-	retrieve connections and layers
+    translation update: ja by Yoichi and his team
 
-2011-07-12  Giuseppe Sucameli 
+Matthias Kuhn 	2013-05-13
 
-	* src/app/CMakeLists.txt, src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgnewconnection.h,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgsdbfilterproxymodel.cpp,
-	src/app/qgsdbfilterproxymodel.h, src/app/qgsdbtablemodel.cpp,
-	src/app/qgsdbtablemodel.h, src/core/CMakeLists.txt,
-	src/core/qgsdbfilterproxymodel.cpp,
-	src/core/qgsdbfilterproxymodel.h, src/core/qgsdbtablemodel.cpp,
-	src/core/qgsdbtablemodel.h, src/plugins/spit/CMakeLists.txt,
-	src/providers/postgres/CMakeLists.txt,
-	src/providers/postgres/qgspgnewconnection.cpp,
-	src/providers/postgres/qgspgnewconnection.h,
-	src/providers/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspgsourceselect.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: add QgsDataItem to the
-	postgres provider
+    [attrtable] Update context help
 
-2011-06-06  Giuseppe Sucameli 
+Matthias Kuhn 	2013-05-13
 
-	* src/providers/postgres/CMakeLists.txt,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: get supported layers
-	from the provider
+    [qgis_help] Detect proper resource path when running from build dir
 
-2011-06-06  Giuseppe Sucameli 
+Juergen E. Fischer 	2013-05-13
 
-	* src/providers/postgres/CMakeLists.txt,
-	src/providers/postgres/qgspostgresconnection.cpp,
-	src/providers/postgres/qgspostgresconnection.h: easy way to access
-	to postgres connections
+    add to german function help
 
-2011-07-12  Marco Hugentobler 
+Matthias Kuhn 	2013-05-13
 
-	* src/mapserver/qgsprojectparser.cpp: Add Service element when
-	taking contact information from the project file
+    GUI (Vector layer properties) QSplitter for fields properties tab
 
-2011-07-12  NathanW 
+vinayan 	2013-05-13
 
-	* src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h,
-	src/ui/qgsexpressionbuilder.ui: Fill value list from selected field.
+    bring layerAdded signal back to fix synchronize
 
-2011-07-12  Marco Hugentobler 
+vinayan 	2013-05-13
 
-	* : commit 983a3ad2a5bccc4532f4d42e5d12a8ba57f8f033 Author: NathanW
-	 Date:   Tue Jul 12 13:36:19 2011 +1000
+    more fixes to offlineediting - back to life
 
-2011-07-12  NathanW 
+vinayan 	2013-05-12
 
-	* src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h,
-	src/ui/qgsexpressionbuilder.ui: Added fields and operators to tree
-	view
+    fix offline editing plugin
 
-2011-07-12  NathanW 
+Nathan Woodrow 	2013-05-13
 
-	* src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h,
-	src/ui/qgsexpressionbuilder.ui: Add model to tree view
+    Change -> to → in function help
 
-2011-07-11  Martin Dobias 
+Juergen E. Fischer 	2013-05-13
 
-	* src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsbrowserdockwidget.cpp, src/app/qgsbrowserdockwidget.h,
-	src/browser/CMakeLists.txt, src/browser/qgsbrowsermodel.cpp,
-	src/browser/qgsbrowsermodel.h, src/core/CMakeLists.txt,
-	src/core/qgsbrowsermodel.cpp, src/core/qgsbrowsermodel.h: [FEATURE]
-	Add browser dock widget to QGIS main window. Layers can be added to
-	canvas by double-clicking them in the browser.
+    sip also doesn't like public (followup 0ec5dc4 and fa0a9b7)
 
-2011-07-11  Juergen E. Fischer 
+Matthias Kuhn 	2013-05-13
 
-	* ms-windows/osgeo4w/package-nightly.cmd: include globe plugin in
-	nightly build
+    Emit finshed signal, when the vector layer cache has been initialized.
 
-2011-07-11  NathanW 
+Borys Jurgiel 	2013-05-13
 
-	* src/ui/qgsexpressionbuilder.ui: Redesign of expression builder UI
+    Disable also plugins in user specified directories when running with --noplugins option
 
-2011-07-11  Marco Hugentobler 
+Matthias Kuhn 	2013-05-13
 
-	* : commit 8e3aca41ee4eb7b420c1adccf3802b66257eb5af Author: Juergen
-	E. Fischer  Date:   Sun Jul 10 13:36:29 2011 +0200
+    Use QgsMessageBar instead of QMessageBox
 
-2011-07-10  Tim Sutton 
+Matthias Kuhn 	2013-05-13
 
-	* resources/symbology-ng-style.xml: Added a more comprehensive set
-	of default symbols based on work done for me by Petronella Tizora
-	(see
+    [Fix #7698] Attributetable crashes on close when valuemap is used
 
-	http://linfiniti.com/2011/07/openstreetmaposm-cartography-using-qgis-part-2/). You will need to remove your ~/.qgis/symbology-ng-style.xml in order to see them I think.
+Matthias Kuhn 	2013-05-13
 
-2011-07-09  Pirmin Kalberer 
+    [Fix #7784] Browser keeps crashing when navigating the tree
 
-	* CMakeLists.txt: Build without globe by default
+Matthias Kuhn 	2013-05-13
 
-2011-07-08  Marco Hugentobler 
+    [attrtable] Update title when filter column query changes
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/ui/symbollayer/widget_linepatternfill.ui: More robust pattern
-	calculation
+Matthias Kuhn 	2013-05-13
 
-2011-07-08  Marco Hugentobler 
+    [Fix #7798] (I)LIKE operator escapes regexp characters before computing regexp
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_linepatternfill.ui: Create base class for
-	QImage fills, add custom outline to line  pattern fill
+Marco Hugentobler 	2013-05-13
 
-2011-07-07  Juergen E. Fischer 
+    Small performance improvement in gdal provider
 
-	* i18n/qgis_de.ts, src/app/legend/qgslegendlayer.cpp: german
-	translation update
+Marco Hugentobler 	2013-05-13
 
-2011-07-07  Juergen E. Fischer 
+    Improve WMS server performance
 
-	* src/app/CMakeLists.txt: refix qgis.ico move
+Marco Hugentobler 	2013-05-13
 
-2011-07-07  Richard Duivenvoorde 
+    sip does not like CORE_EXPORT and Q_OBJECT
 
-	* src/ui/qgswmssourceselectbase.ui: fix #4039
+Merge: a14adc4 23a7ebf
+Nathan Woodrow 	2013-05-12
 
-2011-07-06  Marco Hugentobler 
+    Merge pull request #587 from nyalldawson/new_functions
+    
+    New functions
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: First experimental
-	version of line pattern drawing
+nyalldawson 	2013-05-13
 
-2011-07-06  William Kyngesburye 
+    Add a scale_linear function, for linear interpolation between and input domain and output range
 
-	* mac/app.info.plist.in, mac/framework.info.plist.in: missed these
-	also in 3ccae3f
+nyalldawson 	2013-05-12
 
-2011-07-06  Tim Sutton 
+    Add trim function
 
-	* : commit ae176a9a05b999675e22c9d61701578142467424 Author: Marco
-	Hugentobler  Date:   Wed Jul 6
-	11:18:35 2011 +0200
+nyalldawson 	2013-05-12
 
-2011-07-06  Tim Sutton 
+    Add abs function
 
-	* : commit bff8e544655cc0ecf7247ff2954794918faac471 Merge: bd495c1
-	49e9a62 Author: Marco Hugentobler 
-	Date:   Wed Jul 6 08:31:56 2011 +0200
+nyalldawson 	2013-05-11
 
-2011-07-05  William Kyngesburye 
+    Add floor and ceil functions
 
-	* images/icons/CMakeLists.txt: missed file update in 3ccae3f
+nyalldawson 	2013-05-11
 
-2011-07-05  William Kyngesburye 
+    Add max and min functions
 
-	* images/icons/mac/CMakeLists.txt, src/mac/CMakeLists.txt,
-	src/mac/Contents/CMakeLists.txt, src/mac/Contents/Info.plist.cmake,
-	src/mac/Contents/Info.plist.in, src/mac/Contents/PkgInfo,
-	src/mac/Contents/Resources/CMakeLists.txt: forgot to move some files
-	for 6d788eb
+nyalldawson 	2013-05-11
 
-2011-07-06  Pirmin Kalberer 
+    Add regexp_substr function for returning matched part of string against regex
 
-	* CMakeLists.txt, cmake/FindOSGEARTH.cmake,
-	src/plugins/CMakeLists.txt: CMake for globe
+nyalldawson 	2013-05-11
 
-2011-07-05  Pirmin Kalberer 
+    Small fixes to function help
 
-	* : Merge cleanup
+nyalldawson 	2013-05-11
 
-2011-04-17  Marco Bernasocchi 
+    Add rand and randf functions for generating random numbers
 
-	* : new rotation reset icon
+Juergen E. Fischer 	2013-05-12
 
-2011-04-04  Pirmin Kalberer 
+    german translation update
 
-	* src/plugins/globe/globe_plugin.cpp: Default compositor
-	multitexture_ffp
+Juergen E. Fischer 	2013-05-12
 
-2011-03-06  Pirmin Kalberer 
+    postgres provider:
+    - move available table detection to thread
+    - more progress messages
 
-	* src/plugins/globe/CMakeLists.txt: Fixed world.tif install
+Juergen E. Fischer 	2013-05-12
 
-2011-03-06  Pirmin Kalberer 
+    oracle provider:
+    - make searching in meta data table default
+    - also list synonyms
+    - more progress messages
 
-	* src/plugins/globe/CMakeLists.txt, src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp: Replaced earth file with
-	programmatic map construction
+Juergen E. Fischer 	2013-05-12
 
-2011-03-06  Pirmin Kalberer 
+    allow credential requests from threads
 
-	* src/plugins/globe/CMakeLists.txt, src/plugins/globe/Controls,
-	src/plugins/globe/Controls.cpp, src/plugins/globe/WorldWindOptions,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h: Update to OsgEarth 2.0
+Juergen E. Fischer 	2013-05-11
 
-2011-03-05  Pirmin Kalberer 
+    don't reload the whole browser model when the project home changes (fixes #7520)
 
-	* src/plugins/globe/CMakeLists.txt: Use CMake vars
+Merge: 724ed72 2c37896
+Tim Sutton 	2013-05-12
 
-2011-02-20  mbernasocchi 
+    Merge pull request #582 from ccrook/delimited_text_indexing_implemented
+    
+    Delimited text provider indexing efficiency improvements.
 
-	* src/plugins/globe/globe_plugin.cpp: plugin visibility system was
-	added to trunk in https://trac.osgeo.org/qgis/changeset/15224
+Chris Crook 	2013-05-13
 
-2011-02-20  mbernasocchi 
+    Documentation fix
 
-	* src/plugins/globe/globe_plugin.cpp: Globe is now visible to other
-	(python as well) plugins. signals from globe can be catched.
+Borys Jurgiel 	2013-05-12
 
-2011-02-19  Marco Bernasocchi 
+    Minor fixes for better compatibility with KDevelop
 
-	* src/plugins/globe/globe_plugin.cpp: implemented a better
-	syncExtent method using QgsDistanceArea
+Merge: 799870d 9dd8b2f
+Chris Crook 	2013-05-13
 
-2011-02-19  Marco Bernasocchi 
+    Merge branch 'master' into delimited_text_indexing_implemented
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: code clean up
+Merge: 8012065 6e3e89b
+Tim Sutton 	2013-05-12
 
-2011-02-19  Marco Bernasocchi 
+    Merge branch 'customCRS' of https://github.com/leyan/Quantum-GIS
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: - added support for globe coordinates, they are now shown in the
-	status bar. - added modkey support
+Werner Macho 	2013-05-12
 
-2011-02-18  Marco Bernasocchi 
+    translation updates: galician by Xan
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: shows mouse click WGS coordinates
+Salvatore Larosa 	2013-05-12
 
-2011-02-17  Marco Bernasocchi 
+    [pyqgis-console]  minor fixes: followup a60e74a
 
-	* src/plugins/globe/globe_plugin.cpp: fixed bug in elevation layers
-	dialog when changeing between projects
+Salvatore Larosa 	2013-05-08
 
-2011-02-15  Marco Bernasocchi 
+    [pyqgis-console] a simple syntax checker for the editor
+    - some fixes and code cleanup
 
-	* src/plugins/globe/globe_plugin.cpp: Patched source against
-	http://trac.osgeo.org/qgis/changeset/14452 to use newProjectCreated
-	signal
+Merge: bbdeceb 2ad5707
+vinayan 	2013-05-11
 
-2011-02-14  Marco Bernasocchi 
+    Merge pull request #585 from vinayan/randomsel
+    
+    [Fix #7785] - ftools-random selection broken in master
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: Fixed bug on new
-	project created
+vinayan 	2013-05-11
 
-2011-02-10  Marco Bernasocchi 
+    fix random selections in sextante
 
-	* src/plugins/globe/globe_plugin.cpp: nicer gui
+vinayan 	2013-05-11
 
-2010-12-31  Pirmin Kalberer 
+    ftools-fix broken random selection
 
-	* src/plugins/globe/globe_plugin.cpp: Debug message removed
+Nathan Woodrow 	2013-05-11
 
-2010-12-31  Pirmin Kalberer 
+    Add function help
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: Place 3D models on
-	point layer
+Salvatore Larosa 	2013-05-11
 
-2010-12-30  Pirmin Kalberer 
+    [pyqgis-console] disables the save button if the document is not modified
 
-	* src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_gui.cpp,
-	src/plugins/globe/globe_plugin_gui.h,
-	src/plugins/globe/globe_plugin_guibase.ui: globe_plugin_guibase.ui
-	removed
+Salvatore Larosa 	2013-05-10
 
-2010-12-10  Marco Bernasocchi 
+    [pyqgis-console] close bracket automatically
 
-	* src/plugins/globe/globe_plugin.cpp: FIXED ALL issues regarding
-	elevationDatasourceChanges and globeClosed signals
+Juergen E. Fischer 	2013-05-10
 
-2010-12-10  Marco Bernasocchi 
+    german translation update
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: fixed closeEvent by subclassing
-	QDockWidget instead of QgsGLWidgetAdapter
+Juergen E. Fischer 	2013-05-10
 
-2010-12-10  Marco Bernasocchi 
+    fix another doxygen warning
 
-	* src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/qgsosgviewer.h: fixed GlobeClosed signal, now need
-	to fix closeEvent
+Juergen E. Fischer 	2013-05-10
 
-2010-12-10  Marco Bernasocchi 
+    handle bad layer: show unfixable layer count as message bar and skip dialog when list is empty.
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/qgsosgviewer.cpp: fixed elevationDatasetsChanged()
-	signal
+Juergen E. Fischer 	2013-05-10
 
-2010-12-10  Marco Bernasocchi 
+    composer map widget: remove slot for previously removed line width widget
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: added suppor for signals for
-	elevationDatasourceChanged and globeClosed, they don't work yet
-	since I neet to understand how to set viever and mSettingsDialog as
-	sender. see FIXME in globe_plugin.cpp Regression: moving rows up and down bug -> work on it tomorrow
+Juergen E. Fischer 	2013-05-10
 
-2010-12-09  Marco Bernasocchi 
+    oracle & postgres provider: show progress messages when scanning for available geometry columns
+    postgres provider: stop using pg column sizes (fixes #7799)
+    oracle provider: skip dropped tables (fixes #7795)
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: testing newProjectCreated ()
-	signal
+Merge: 0d464b2 4292976
+Chris Crook 	2013-05-10
 
-2010-12-09  Pirmin Kalberer 
+    Merge resolved
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp: Use cache from settings
+Juergen E. Fischer 	2013-05-10
 
-2010-12-09  Pirmin Kalberer 
+    localize support links
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp: getDatabasePager clear
-	when changing 3D settings
+Juergen E. Fischer 	2013-05-10
 
-2010-12-09  Marco Bernasocchi 
+    fix doxygen warning
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.cpp: initial readProject
-	signal support
+Merge: 2caf0e0 59ffd77
+Jürgen Fischer 	2013-05-09
 
-2010-12-09  Marco Bernasocchi 
+    Merge pull request #583 from ccrook/delimited_text_bug_fixes_3
+    
+    Fixed bug processing URL parameters
 
-	* src/plugins/globe/globe.earth: fixed earth file
+nyalldawson 	2013-05-10
 
-2010-12-09  Marco Bernasocchi 
+    Disable blend modes when printing or pdf exporting as vector, prevents missing composer items in output
 
-	* src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: gui stable, added
-	cache checkboxes
+Nathan Woodrow 	2013-05-10
 
-2010-12-09  Marco Bernasocchi 
+    Add support page link.
+    Load online help manual from help menu
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: adding initial
-	cache support
+Chris Crook 	2013-05-10
 
-2010-12-09  Pirmin Kalberer 
+    Fixed bug processing URL parameters
 
-	* src/plugins/globe/globe.earth, src/plugins/globe/globe_plugin.cpp: 
-	Elevation layers from settings dialog
+Chris Crook 	2013-05-06
 
-2010-12-09  Marco Bernasocchi 
+    Delimited text provider indexing implemented.
+    
+    Efficiency improvements.
+    
+    Adds capabilities
+       SelectAtId
+       CreateSpatialIndex
+    
+    This uses line number as an index.  Allows jumping to a line number
+    without interpreting all intermediate records, so much more efficient.
+    Also retains the current record in a buffer, so successive requests for
+    the same record do not require rereading the file.
+    
+    With index available have also added indexing of subsets and optional
+    creation of spatial index.
+    
+    Note: did try using QTextStream.pos to build a random access index -
+    this was incredibly slow.  Have found using line based index is
+    reasonably fast even on quite large (50+Mb) text files.
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h: Elevation Layers are now
-	saved in the project file instead of in QSettings
+Juergen E. Fischer 	2013-05-09
 
-2010-12-08  Marco Bernasocchi 
+    reapply some cleanup to 'styles_to_db'
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: added move layers
-	up or down
+Emilio Loi 	2013-05-07
 
-2010-12-08  Marco Bernasocchi 
+    Solved errors made using diff tool in last merge
 
-	* src/plugins/globe/globe_plugin_dialog.cpp: Single selection only.
-	Segfaults resolved
+Emilio Loi 	2013-05-07
 
-2010-12-08  Marco Bernasocchi 
+    Ask for confirmation before overwrite a layer style
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: more code clean up
+Emilio Loi 	2013-05-03
 
-2010-12-08  Marco Bernasocchi 
+    [FEATURE] Load and Save SLD & QML styles to DB
+    Replaced last occurence of "on database" with "in database"
+    Solved an issue loading the default style adding a layer
+    Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: cleaned code, gui
-	set to no drag and drop and single selection mode
+Emilio Loi 	2013-05-03
 
-2010-12-08  Marco Bernasocchi 
+    Replaced one occurence of "on database" with "in database"
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h: first cleanup fixed file
-	check
+Juergen E. Fischer 	2013-05-09
 
-2010-12-08  Marco Bernasocchi 
+    german translation update
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: pre cleanup code
+Juergen E. Fischer 	2013-05-09
 
-2010-12-08  Marco Bernasocchi 
+    oracle provider: add context help
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: working initial
-	gui for elevation, needs code clean up
+Juergen E. Fischer 	2013-05-09
 
-2010-12-08  Marco Bernasocchi 
+    wms provider: add trailing slash, if url path is empty otherwise and clear tileset list, when a tileless wms server is connected
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: added initial
-	support for layer loading through the gui
+William Kyngesburye 	2013-05-08
 
-2010-12-07  Marco Bernasocchi 
+    fix GDAL path defaults for OS X
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: adapted gui to
-	support data input
+Radim Blazek 	2013-05-08
 
-2010-12-07  Marco Bernasocchi 
+    GRASS no data value fix2
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: code cleanup
+Radim Blazek 	2013-05-08
 
-2010-12-07  Marco Bernasocchi 
+    GRASS no data value fix
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: Added disabling of
-	irrelevant options to settings dialog
+Radim Blazek 	2013-05-08
 
-2010-12-01  Pirmin Kalberer 
+    GRASS vector crash fix #7140
 
-	* src/plugins/globe/globe_plugin.cpp: Refresh button
+Radim Blazek 	2013-05-08
 
-2010-12-01  Pirmin Kalberer 
+    GRASS Direct disabled for 2.0
 
-	* src/plugins/globe/globe_plugin.cpp: onClick event on mouse release
+Merge: 4c7f51e c054c30
+Marco Hugentobler 	2013-05-08
 
-2010-12-01  Marco Bernasocchi 
+    Merge branch 'dd_symbology_help'
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: fixed homeHandler
+Marco Hugentobler 	2013-05-08
 
-2010-12-01  Marco Bernasocchi 
+    More help text for data defined dialogs
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: added HomeControlHandler
+Radim Blazek 	2013-05-08
 
-2010-12-01  Marco Bernasocchi 
+    composer legend: store user defined labels separately, fixes partialy #6960
 
-	* src/plugins/globe/globe_plugin.cpp: fixed sync handler fixed
-	refresh handler added home handler code formatting
+Radim Blazek 	2013-05-08
 
-2010-11-29  Pirmin Kalberer 
+    WMS capabilities HTTP Get namespace fix
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: Code cleanup
+nyalldawson 	2013-05-08
 
-2010-11-29  Marco Bernasocchi 
+    Small fixes to heatmap plugin
+    Update context help for heatmap
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: reworked gui added new handlers
-	//TODO use GlobePlugin::syncExtent instead of duplicating code
+Marco Hugentobler 	2013-05-07
 
-2010-11-29  Marco Bernasocchi 
+    Add help text in data defined dialog
 
-	* src/plugins/globe/globe_plugin.cpp: initial sync exent button
+Salvatore Larosa 	2013-05-07
 
-2010-11-28  Marco Bernasocchi 
+    [pyqgis-console] add scroll area for settigs dialog
+    - does also the last tab closable
+    - fixes some translate string and warns the user
+      if the file has been deleted
+    - minor fixes
 
-	* src/plugins/globe/globe_plugin.cpp: testing gui reset buttons
+Marco Hugentobler 	2013-05-07
 
-2010-11-26  Marco Bernasocchi 
+    Don't advertise jpeg as image type for GetLegendGraphic
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: added live preview
-	of Stereo Settings
+Marco Hugentobler 	2013-05-07
 
-2010-11-26  Marco Bernasocchi 
+    Use case insensitive string comparison for wms request names
 
-	* src/plugins/globe/globe_plugin.cpp: added GUI navigation, reset
-	buttons still missing
+Merge: 83ffa05 88e18cc
+Werner Macho 	2013-05-07
 
-2010-11-26  Marco Bernasocchi 
+    Merge pull request #580 from rduivenvoorde/nl2.0
+    
+    nl translation update
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: added missing tilt icons added
-	KeyboardControlHandler
+Richard Duivenvoorde 	2013-05-07
 
-2010-11-26  Pirmin Kalberer 
+    nl translation update
 
-	* src/plugins/globe/globe_plugin.cpp: Revert FlyToExtentHandler
+Radim Blazek 	2013-05-07
 
-2010-11-25  Marco Bernasocchi 
+    raster 3 band taransparency, fixes #7748, thanks to Mathieu Pellerin
 
-	* src/plugins/globe/globe_plugin.cpp: added tilt to gui
+Matthias Kuhn 	2013-05-07
 
-2010-11-26  Pirmin Kalberer 
+    Followup for 524e142: Fix compile error in non-debug version
 
-	* src/plugins/globe/Controls.cpp,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: onMouseDown handling
+Matthias Kuhn 	2013-05-07
 
-2010-11-25  Marco Bernasocchi 
+    [Fix #7772] Check attribute index before setting attribute to avoid crash
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: added keybord controls: - pan
-	Horizontal 4,6 - pan Vertical 8,2 - rotate left / - rotate right * -
-	tilt up 9 - tilt down 3 - zoom +- uset this keys because I can't get osgGA::GUIEventAdapter::KEY_Left
-	ecc to work yet
+Marco Hugentobler 	2013-05-07
 
-2010-11-25  Marco Bernasocchi 
+    Fix map units in centroid symbol layer (ticket 7738)
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: renamed flytoextenthandler to
-	controlshandler
+nyalldawson 	2013-05-07
 
-2010-11-25  Marco Bernasocchi 
+    Make sure heatmap is cancellable
 
-	* src/plugins/globe/globe_plugin.cpp: added tilt to gui
+Etienne Tourigny 	2013-05-06
 
-2010-11-24  Pirmin Kalberer 
+    fix single band pseudo sort toolbutton size (#7138)
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: NavigationControl
+Juergen E. Fischer 	2013-05-06
 
-2010-11-24  Marco Bernasocchi 
+    allow popups from html wms responses
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: testing how to get key bindings
+Victor Olaya 	2013-05-06
 
-2010-11-24  Marco Bernasocchi 
+    [sextante] fixed union algorithm
 
-	* src/plugins/globe/globe_plugin.cpp: test github commit hook
+Etienne Tourigny 	2013-05-06
 
-2010-11-24  Marco Bernasocchi 
+    make raster source in General tab enabled (but read-only), so it can be copied ; add vector source to vector properties General tab, make UI consistent with that of raster properties
 
-	* src/plugins/globe/globe_plugin.cpp: added all elements to gui
+Etienne Tourigny 	2013-05-06
 
-2010-11-23  Pirmin Kalberer 
+    update histogram UI and options (#7619)
 
-	* src/plugins/globe/globe_plugin.cpp: moveVControls fixed
+Juergen E. Fischer 	2013-05-06
 
-2010-11-23  Marco Bernasocchi 
+    resolve cyclic include masking QgsDiagramLayerSettings in 2479d8326 on windows
 
-	* src/plugins/globe/globe_plugin.cpp: fixed typo
+Juergen E. Fischer 	2013-05-06
 
-2010-11-23  Marco Bernasocchi 
+    fix #7770
 
-	* src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: added initial gui
-	to the globe
+Radim Blazek 	2013-05-06
 
-2010-11-23  Marco Bernasocchi 
+    script to generate random vectors which may be used for benchmarks
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: Completed Stereo
-	settings support added reset stereo settings to defaults values
-	button
+Radim Blazek 	2013-05-06
 
-2010-11-21  Pirmin Kalberer 
+    Use OGR VSI cache as buffer on Windows
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: Handle screen distance stereo
-	setting
+Merge: a5a7c1c 5c240bc
+Nyall Dawson 	2013-05-05
 
-2010-11-20  Marco Bernasocchi 
+    Merge pull request #579 from nyalldawson/blend_warning
+    
+    Show warning when printing or pdfing a composition when blend modes are present
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui,
-	src/plugins/globe/qgsosgviewer.cpp: refactoring of setStereoMode
-	done
+nyalldawson 	2013-05-06
 
-2010-11-20  Marco Bernasocchi 
+    Small fixes to heatmap plugin
 
-	* src/plugins/globe/globe_plugin.cpp: added modal dialog
+Merge: 85a3a67 5e41382
+vinayan 	2013-05-05
 
-2010-11-20  Pirmin Kalberer 
+    Merge pull request #577 from vinayan/sliverFix
+    
+    [Fix #7714] ftools - Eliminate - improve performance with new vector api calls
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: Made settings dialog a member of
-	GlobePlugin
+nyalldawson 	2013-05-06
 
-2010-11-18  Marco Bernasocchi 
+    Fix heatmap rasters not correctly initialising with NODATA value
 
-	* src/plugins/globe/globe_plugin_dialog_guibase.ui,
-	src/plugins/globe/qgsosgviewer.cpp: typo fixes
+nyalldawson 	2013-05-04
 
-2010-11-18  Marco Bernasocchi 
+    Make sure print as raster checkbox is updated after blend mode warning
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: forgot this files
-	in last checkout
+nyalldawson 	2013-05-03
 
-2010-11-18  Marco Bernasocchi 
+    Add parameter for QgsMessageViewer to disable deleteOnClose, allows retrieving checkBoxState after dialog has closed
 
-	* src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: refactoring TODO: Call QgsGLWidgetAdapter::setStereoMode(QString stereoMode)
-	from GlobePlugin::settings() instead of code duplication in
-	GlobePluginDialog::setStereoMode()
+nyalldawson 	2013-05-03
 
-2010-11-18  Pirmin Kalberer 
+    Add warning for printing and pdf export with blend modes with option to print as raster
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: Settings dialog
+Salvatore Larosa 	2013-05-05
 
-2010-11-17  Pirmin Kalberer 
+    [pyqgis-console] just shows the context menu on tabs (does not on tabbar)
 
-	* src/plugins/globe/globe.earth: Portable cache path
+Salvatore Larosa 	2013-05-05
 
-2010-11-17  Marco Bernasocchi 
+    [pyqgis-console] fix typo and indentation update
 
-	* src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: Added runtime stereo selection to
-	settings dialog and at plugin start
+Salvatore Larosa 	2013-05-05
 
-2010-11-17  Marco Bernasocchi 
+    [pyqgis-console] add a context menu for tabs
 
-	* src/plugins/globe/globe_plugin.qrc,
-	src/plugins/globe/settings_guibase.ui: fixing resource file
+Merge: 87f7ea1 fc55655
+Werner Macho 	2013-05-05
 
-2010-11-16  Marco Bernasocchi 
+    Merge pull request #575 from Jean-Roc/mywork
+    
+    update french translation
 
-	* src/plugins/globe/CMakeLists.txt, src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.qrc,
-	src/plugins/globe/globe_plugin_dialog.cpp,
-	src/plugins/globe/globe_plugin_dialog.h,
-	src/plugins/globe/globe_plugin_dialog_guibase.ui: implemented
-	settings dialog with placeholders methods
+Victor Olaya 	2013-05-05
 
-2010-11-16  Marco Bernasocchi 
+    [sextante] fixed problem when defining help files for the first time
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/settings_guibase.ui: adding place holders for
-	settings dialog adding settings UI file
+Merge: 945bc60 788e429
+Borys Jurgiel 	2013-05-05
 
-2010-11-16  Marco Bernasocchi 
+    Merge pull request #578 from minorua/fieldname_encoding
+    
+    write field names in the same encoding as attribute values (fix #4540)
 
-	* : adding new globe images
+Victor Olaya 	2013-05-05
 
-2010-11-14  Pirmin Kalberer 
+    [sextante] model outputs are now shown in canvas
 
-	* : Globe icon
+Minoru Akagi 	2013-05-05
 
-2010-11-14  Pirmin Kalberer 
+    write field names in the same encoding as attribute values (fix #4540)
 
-	* src/plugins/globe/CMakeLists.txt, src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: Use WorldWind SRTM with
-	pre-populated cache. GlobePlugin code cleanup.
+vinayan 	2013-05-05
 
-2010-11-14  Pirmin Kalberer 
+    replace old select calls with getFeatures method
 
-	* src/plugins/globe/globe.earth, src/plugins/globe/globe_plugin.cpp: 
-	Moved sample 3D models to Lech
+Jean-Roc Morreale 	2013-05-04
 
-2010-11-13  Pirmin Kalberer 
+    update french translation
 
-	* src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h: cache configuration
+Salvatore Larosa 	2013-05-04
 
-2010-11-13  Mathias Walker 
+    [pyqgis-console] fixes translation strings
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: - node placement on terrain surface - placement test using generated
-	models
+Salvatore Larosa 	2013-05-04
 
-2010-11-13  Pirmin Kalberer 
+    [pyqgis-console] minor fixes and cleanup
 
-	* : Worldwind cache data
+Salvatore Larosa 	2013-05-03
 
-2010-11-13  Pirmin Kalberer 
+    [pyqgis-console] some fix for find text in editor
+    - changes tabs to north
 
-	* src/plugins/globe/globe.earth: Remove world.tif from globe.earth
+Victor Olaya 	2013-05-04
 
-2010-11-13  Pirmin Kalberer 
+    [sextante] edited description of OTB orthorectification algorithm
 
-	* src/plugins/globe/globe_plugin.cpp: Use world.tif from QGIS
-	package
+Victor Olaya 	2013-05-04
 
-2010-11-13  Pirmin Kalberer 
+    [sextante] fixed help edition dialog.
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: HTTP Proxy support
+Victor Olaya 	2013-05-04
 
-2010-11-13  Pirmin Kalberer 
+    [sextante] added back script creation tools to toolbox
 
-	* src/plugins/globe/CMakeLists.txt: world.tif added
+Leyan 	2013-05-04
 
-2010-11-10  Pirmin Kalberer 
+    do not use QgsCoordinateReferenceSystem internally
 
-	* src/plugins/globe/qgsosgviewer.cpp: mouse tracking
+Leyan 	2013-05-04
 
-2010-11-07  Pirmin Kalberer 
+    check validity of CRS before saving
 
-	* src/plugins/globe/globe_plugin.cpp: GLOBE_OSG_STANDALONE_VIEWER
+Leyan 	2012-11-25
 
-2010-11-07  Pirmin Kalberer 
+    Updates to compile with current master
 
-	* src/plugins/globe/CMakeLists.txt, src/plugins/globe/Controls,
-	src/plugins/globe/Controls.cpp, src/plugins/globe/globe_plugin.cpp: 
-	Added Controls from 2.0 master branch
+Leyan 	2012-11-04
 
-2010-11-02  Marco Bernasocchi 
+    Update to custom CRS management
 
-	* src/plugins/globe/qgsosgviewer.cpp: Fixed mousewheel zoom making
-	it consistent to qgis zoom (scroll up = zoom in)
+Juergen E. Fischer 	2013-05-03
 
-2010-11-02  Pirmin Kalberer 
+    html identify results: catch loadFinished only once
 
-	* src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h: Initial support for
-	non-WGS-84 layers
+Juergen E. Fischer 	2013-05-03
 
-2010-11-01  Pirmin Kalberer 
+    catch system signals and stack trace on linux
 
-	* src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/globe_plugin.cpp: Install globe.earth in
-	QGIS_DATA_DIR/globe
+Juergen E. Fischer 	2013-05-03
 
-2010-10-10  Pirmin Kalberer 
+    more spelling fixes
 
-	* src/plugins/globe/qgsosgviewer.cpp: include cleanup
+Matthias Kuhn 	2013-05-03
 
-2010-10-06  Pirmin Kalberer 
+    [diagrams] Show message on messagebar instead of messagebox
+    And some indentation updates
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: Mouse wheel zoom
+Matthias Kuhn 	2013-05-03
 
-2010-10-06  Pirmin Kalberer 
+    [diagrams] Usability improvements
+     * Choose default attribute value for interpolation if none is set
+     * Remember last used tab
+     * Default for scale dependent visibility matches layer settings
 
-	* src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h: Fly to extent handler
+Juergen E. Fischer 	2013-05-03
 
-2010-09-03  Pirmin Kalberer 
+    fix spelling errors
 
-	* src/plugins/globe/globe.earth,
-	src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/qgsosgearthtilesource.cpp: extent check in tile
-	source
+Juergen E. Fischer 	2013-05-03
 
-2010-09-03  Pirmin Kalberer 
+    more translation string cleanups
 
-	* src/plugins/globe/globe.earth, src/plugins/globe/globe_plugin.cpp: 
-	Aster DEM
+Juergen E. Fischer 	2013-05-03
 
-2010-09-03  Pirmin Kalberer 
+    german translation update with some string fixes
 
-	* src/plugins/globe/globe_plugin.cpp: layersChanged experiments
+Juergen E. Fischer 	2013-05-03
 
-2010-08-19  Pirmin Kalberer 
+    cleanup style to db:
+    - add sip bindings to new methods
+    - table name, sql queries and constants should not be translated
+    - replace QVector with QStringList
 
-	* src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h: thread locking removed
+Juergen E. Fischer 	2013-05-02
 
-2010-08-19  Pirmin Kalberer 
+    another indention update
 
-	* src/plugins/globe/CMakeLists.txt,
-	src/plugins/globe/CMakeModules/FindOSG.cmake,
-	src/plugins/globe/CMakeModules/FindOpenThreads.cmake,
-	src/plugins/globe/globe.earth, src/plugins/globe/globe_plugin.cpp,
-	src/plugins/globe/globe_plugin.h,
-	src/plugins/globe/globe_plugin.qrc,
-	src/plugins/globe/globe_plugin_gui.cpp,
-	src/plugins/globe/globe_plugin_gui.h,
-	src/plugins/globe/globe_plugin_guibase.ui,
-	src/plugins/globe/qgsosgearthtilesource.cpp,
-	src/plugins/globe/qgsosgearthtilesource.h,
-	src/plugins/globe/qgsosgviewer.cpp,
-	src/plugins/globe/qgsosgviewer.h: globe plugin from master branch
+Victor Olaya 	2013-05-02
 
-2011-07-05  Juergen E. Fischer 
+    Changed default cellsize for SAGA algorithms
 
-	* src/app/composer/qgscomposer.cpp, src/mapserver/qgswmsserver.cpp: 
-	fix 55a1778 with patched qt on osgeo4w
+Victor Olaya 	2013-05-02
 
-2011-07-05  Juergen E. Fischer 
+    Adjustments in DEM parameters fro OTB algorithms
 
-	* cmake/FindQGIS.cmake, images/icons/CMakeLists.txt,
-	python/pyspatialite/CMakeLists.txt, src/app/CMakeLists.txt,
-	src/core/CMakeLists.txt: fix windows build
+Victor Olaya 	2013-05-02
 
-2011-07-05  Juergen E. Fischer 
+    Added extra advanced options for GRASS algorithm Import/Export
+    
+    Modified/added some GRASS descriptions
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: add support for
-	mixed case geometry types of PostGIS 2.0
+Salvatore Larosa 	2013-05-02
 
-2011-07-05  Marco Hugentobler 
+    [pyqgis-console] adds a find text widget to editor
 
-	* : commit a637ebcac2e5a0d4f74fbb09367995edaddf3c34 Author: Marco
-	Hugentobler  Date:   Tue Jul 5
-	16:46:39 2011 +0200
+Merge: 3e1f3a0 1dfcf53
+Tim Sutton 	2013-05-02
 
-2011-07-04  Marco Hugentobler 
+    Merge pull request #545 from el1073/styles_to_db
+    
+    [FEATURE] Styles to db - this was approved for late submission prior to the feature freeze
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Use svg cache for
-	svg fill layer
+Juergen E. Fischer 	2013-05-02
 
-2011-07-05  Marco Hugentobler 
+    fix #7749
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Support
-	alpha-transparency in svg markers and fills
+Radim Blazek 	2013-05-02
 
-2011-07-05  NathanW 
+    raster block setIsNoDataExcept fix, fixes #7608
 
-	* src/ui/qgsattributetabledialog.ui: Reduce top and side margins for
-	attribute table dialog
+Merge: 02c9264 ae7115f
+Emilio Loi 	2013-05-02
 
-2011-07-05  Martin Dobias 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
 
-	* python/console.py: Python console: consider also Enter on keypad.
-	Fixes #3855.  Contributed by Steven Mizuno
+Emilio Loi 	2013-05-02
 
-2011-07-04  Martin Dobias 
+    Added a message to explain UI upload feature
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Graduated
-	renderer: handle the case with only one class
+Salvatore Larosa 	2013-05-02
 
-2011-07-04  Martin Dobias 
+    [pyqgis-console] re-added shortcut mistakenly removed in 07abb34
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui: It does not make sense
-	to classify into zero classes, does it?
+Merge: ae48b09 3b28ce3
+Werner Macho 	2013-05-02
 
-2011-07-04  Martin Dobias 
+    Merge pull request #573 from Jean-Roc/master
+    
+    update fr ui
 
-	* src/app/qgisapp.cpp: Remove duplicate menu entries on non-kde
-	platforms (fix #4040)
+Jean-Roc Morreale 	2013-05-02
 
-2011-07-04  Martin Dobias 
+    update french translation
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Fix last
-	equal interval break in graduated symbol renderer (#4044)
+Radim Blazek 	2013-05-02
 
-2011-07-04  William Kyngesburye 
+    mapserver compilation fix
 
-	* cmake/FindQGIS.cmake: simplify detection on OS X
+Merge: db3bfa3 c3df3ba
+Emilio Loi 	2013-05-02
 
-2011-07-04  William Kyngesburye 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
 
-	* CMakeLists.txt, cmake/FindQGIS.cmake,
-	cmake/MacBundleMacros.cmake, images/icons/CMakeLists.txt,
-	mac/cmake/0qgis.cmake.in, mac/cmake/1qt.cmake.in,
-	mac/cmake/2lib.cmake.in, mac/cmake/3fw.cmake.in,
-	src/CMakeLists.txt, src/analysis/CMakeLists.txt,
-	src/app/CMakeLists.txt, src/browser/CMakeLists.txt,
-	src/core/CMakeLists.txt, src/gui/CMakeLists.txt,
-	src/helpviewer/CMakeLists.txt, src/plugins/CMakeLists.txt,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt,
-	src/python/CMakeLists.txt: OS X frameworks for qgis libs; dev
-	frameworks install option; cmake cleanup
+Juergen E. Fischer 	2013-05-02
 
-2011-07-04  Marco Hugentobler 
+    oracle provider: fix pk where clause
 
-	* : commit 3849742b10ee00e6cb005354e716378e89c232e8 Author: Marco
-	Hugentobler  Date:   Mon Jul 4
-	16:32:40 2011 +0200
+Matthias Kuhn 	2013-04-28
 
-2011-07-04  NathanW 
+    Add API to write and read custom data to the layer in a .qgs-file.
+    New signals:
+     * void QgsProject::writeMapLayer( QgsMapLayer*, QDomElement&,  QDomDocument& )
+     * void QgsProject::readMapLayer( QgsMapLayer*, const QDomElement& )
+    
+    Changed method signature:
+     * bool QgsMapLayer::readXML( const QDomNode& )
+       => bool QgsMapLayer::readLayerXML( const QDomElement& )
+     * bool QgsMapLayer::writeXML( QDomNode&, QDomDocument& )
+       => bool QgsMapLayer::writeLayerXML( QDomElement&, QDomDocument& )
 
-	* python/core/qgscomposeritem.sip, python/core/qgscomposerlabel.sip: 
-	Updated Python bindings for lable and composeritem
+Salvatore Larosa 	2013-05-02
 
-2011-07-04  NathanW 
+    [pyqgis-console] fixes import warning
 
-	* src/app/composer/qgscomposeritemwidget.cpp,
-	src/app/composer/qgscomposeritemwidget.h,
-	src/app/composer/qgscomposerlabelwidget.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlabel.h,
-	src/ui/qgscomposeritemwidgetbase.ui,
-	src/ui/qgscomposerlabelwidgetbase.ui: Ability to set id of any
-	composer item moved from just qgscomposerlabel to qgscomposeritem
-	All items can now have a user set id.  Good for plugin automation eg
-	mapbook builder
+Juergen E. Fischer 	2013-05-01
 
-2011-07-04  Marco Hugentobler 
+    german translation update
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Use svg cache for
-	svg fill layer
+Juergen E. Fischer 	2013-05-01
 
-2011-07-04  Marco Hugentobler 
+    indentation update
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Fix some problems
-	with svg cache
+Salvatore Larosa 	2013-05-01
 
-2011-07-04  Marco Hugentobler 
+    [pyqgis-console] warning the user if the file has been modified by another process
+    - set fixed size for corner widget icons
+    - reorganized message levels for the message bar
+    - minor fixes
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Fix some problems
-	with svg cache
+nyalldawson 	2013-05-02
 
-2011-07-04  Tim Sutton 
+    Add tests for python bindings for layer blend modes
 
-	* .gitignore: Better ignore options
+Merge: f62955f cc34d14
+Tim Sutton 	2013-05-01
 
-2011-07-04  Tim Sutton 
+    Merge pull request #533 from leyan/customCRS_API
+    
+    Custom crs api
 
-	* : commit 934e56f8c4aee88992c38f10cce39ccc8cb9217e Author: Tim
-	Sutton  Date:   Mon Jul 4 11:12:41 2011 +0200
+Merge: 5e9e98a 211a090
+Tim Sutton 	2013-05-01
 
-2011-07-04  Tim Sutton 
+    Merge pull request #551 from olivierdalang/SvgLibraryCleanup
+    
+    Svg library cleanup
 
-	* src/app/qgsrasterlayerproperties.cpp: Try to make the histogram
-	smoother
+Merge: 2e446a8 2fb50ab
+Tim Sutton 	2013-05-01
 
-2011-07-04  Juergen E. Fischer 
+    Merge pull request #569 from ccrook/delimited_text_substring_capability
+    
+    Delimited text substring capability - also bug #7742
 
-	* src/app/composer/qgscomposer.cpp, src/mapserver/qgswmsserver.cpp: 
-	fix lenny build
+Radim Blazek 	2013-05-01
 
-2011-07-04  NathanW 
+    limit max number of raster symbol items in legend (may be very slow), resolves slow loading of rasters with large color tables
 
-	* src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.cpp,
-	src/gui/qgsexpressionbuilder.h: Rename QgsExpressionBuilder to
-	QgsExpressionBuilderWidget
+Merge: 39419e1 78f5110
+Chris Crook 	2013-05-02
 
-2011-07-03  NathanW 
+    Merge branch 'delimited_text_bug_fixes_2' into delimited_text_substring_capability
 
-	* src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.cpp,
-	src/gui/qgsexpressionbuilder.h, src/ui/qgsexpressionbuilder.ui: Copy
-	layout and code from field calculator for expression builder widget
+Merge: 1fb1c9c 3c68312
+Chris Crook 	2013-05-02
 
-2011-07-03  Juergen E. Fischer 
+    Merge branch 'master' into delimited_text_bug_fixes_2
 
-	* src/app/composer/qgscomposer.cpp, src/mapserver/qgswmsserver.cpp: 
-	other workaround for Qt#5114 (fixes #3250, #3028, #2598)
+Chris Crook 	2013-05-02
 
-2011-07-03  Juergen E. Fischer 
+    Comment changed only
 
-	* src/app/qgsfieldcalculator.cpp,
-	src/core/symbology-ng/qgssvgcache.h: fix windows build
+Matthias Kuhn 	2013-05-01
 
-2011-07-03  NathanW 
+    [Diagrams] UI-Improvements
+     * Do not allow "fixed size" histograms (makes no sense)
+     * Rewire slots and signals for the fixed size
+     * Default pie dimensions set to 50 mm
 
-	* : Merge remote branch 'upstream/master' into expression-labels
-	Fixed merge conflict in pallabeling Conflicts: 	src/core/qgspallabeling.cpp
+nyalldawson 	2013-05-01
 
-2011-07-02  Marco Hugentobler 
+    Add tests for python bindings for composer item blending and transparency
+    Add python bindings for composer item background
 
-	* src/core/qgspallabeling.cpp: Fix labeling-ng with utf-8 layers
-	(ticket #3854)
+Salvatore Larosa 	2013-05-01
 
-2011-07-01  Marco Hugentobler 
+    [pyqgis-console] fix sharing snippets code via codepad
 
-	* : commit 8cddfb8d5ed3116eb5077e200fb8b53cd280cac3 Merge: d954421
-	4d75a7d Author: NathanW  Date:   Fri Jul 1
-	18:43:41 2011 +1000
+Salvatore Larosa 	2013-04-30
 
-2011-07-01  Juergen E. Fischer 
+    [pyqgis-console] fix comment/uncomment code also on Windows OS
 
-	* src/core/qgssearchtreenode.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: postgresql provider:
-	fix 64bit ints
+nyalldawson 	2013-05-01
 
-2011-07-01  Juergen E. Fischer 
+    Add tests for layer blending
 
-	* src/core/qgssearchstringparser.yy: search string parser: fix -a
-	expression (fixes #4025)
+PhilippeDorelon 	2013-04-30
 
-2011-06-30  Giuseppe Sucameli 
+    Update qgsvectorlayereditbuffer.cpp
 
-	* src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h: [FEATURE] Improve
-	SpatiaLite provider to manage non-spatial tables
+Victor Olaya 	2013-04-30
 
-2011-06-30  Marco Hugentobler 
+    [sextante] fixed blocking typo introduced in cc490fd7acd366
 
-	* python/gui/qgscomposerview.sip, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h: Emit signal when showing / hiding
-	composer
+Victor Olaya 	2013-04-30
 
-2011-06-30  Marco Hugentobler 
+    [sextante] Fixed problem when canceling on batch autofill dialog
 
-	* python/gui/qgscomposerview.sip, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h: Emit signal when showing / hiding
-	composer
+Victor Olaya 	2013-04-30
 
-2011-06-30  Tim Sutton 
+    [sextante] Added checking in case model file cannot be save due to permissions
 
-	* : commit 4888f51d54960b4e01a57b3a4bc8d50d38397c35 Author: Tim
-	Sutton  Date:   Thu Jun 30 14:57:55 2011 +0200
+Merge: 5407616 bc57d56
+vinayan 	2013-04-30
 
-2011-06-30  Tim Sutton 
+    Merge pull request #570 from vinayan/authorsupdate
+    
+    fix tab in authors.txt
 
-	* doc/CODING.t2t: Added section on using QtCreator
+vinayan 	2013-04-30
 
-2011-06-30  Tim Sutton 
+    fix tab in authors.txt
 
-	* src/core/raster/qgsrasterbandstats.h: Fix bugs causing a crash
-	when histogram is gathered due to uninitilised histogram vector
+Salvatore Larosa 	2013-04-30
 
-2011-06-30  Marco Hugentobler 
+    [pyqgis-console] running script without shell window (for Windows OS)
+    - changed runscript icon to contextual menu
 
-	* : commit 4546646f1dd03c899ad505df7afcea51e4e30e62 Author: Marco
-	Hugentobler  Date:   Thu Jun 30
-	09:09:18 2011 +0200
+Merge: 6e6ff40 171973a
+Nyall Dawson 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    Merge pull request #567 from nyalldawson/overview
+    
+    Add blending mode for overview frame, option to invert overview frame
 
-	* images/svg/transport/amenity=ferry_terminal.svg: small tweak to
-	svg file
+Matthias Kuhn 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    [Diagrams] Switch properties dialog to tabs
+    Histograms:
+    * Use a more descriptive text for the size parameter
+    * Hide unneeded parameter controls
 
-	* src/core/symbology-ng/qgssvgcache.cpp: Small fix for svg parameter
-	replacement
+Emilio Loi 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    QgsVectorDataProvider without diff comments
 
-	* images/svg/geometric/Square1.svg,
-	images/svg/geometric/Square2.svg,
-	images/svg/geometric/Triangle1.svg,
-	images/svg/transport/amenity=airport.svg,
-	images/svg/transport/amenity=ferry_terminal.svg,
-	images/svg/transport/amenity=taxi.svg,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp: Added svg parameters to
-	marker files
+Merge: f344e51 8a6cba6
+Emilio Loi 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    Merge branch 'styles_to_db' of https://github.com/el1073/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+src/core/qgsvectordataprovider.h           
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Replace svg
-	params also for preview
+Emilio Loi 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
 
-	* src/core/symbology-ng/qgssvgcache.cpp: Fix replacement in style
-	attribute
+Merge: c499df7 009ba1b
+Emilio Loi 	2013-04-30
 
-2011-06-29  Marco Hugentobler 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+python/console/console_editor.py           
+src/core/qgsvectordataprovider.h           
+src/core/qgsvectorfilewriter.cpp           
 
-	* : commit 66c009fca756a05b726a1703ae930a85a52a1ded Author: Marco
-	Hugentobler  Date:   Wed Jun 29
-	08:21:53 2011 +0200
+Merge: c499df7 009ba1b
+Emilio Loi 	2013-04-30
 
-2011-06-28  Tim Sutton 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+python/console/console_editor.py           
+src/core/qgsvectordataprovider.h           
+src/core/qgsvectorfilewriter.cpp           
 
-	* src/mapserver/qgswmsserver.cpp: Added missing QUrl include
+Merge: 7dc0e51 2f9cb93
+Matthias Kuhn 	2013-04-30
 
-2011-06-28  Marco Hugentobler 
+    Merge pull request #563 from vinayan/rotateMoveFix
+    
+    [Fix #7625] - rubberbands not visible while rotating/moving point geometries
 
-	* : commit c769cdda95e735989ad3f21a8dd29507fa22db77 Author: Tim
-	Sutton  Date:   Tue Jun 28 12:21:33 2011 +0200
+Werner Macho 	2013-04-30
 
-2011-06-28  Marco Hugentobler 
+    translation update: swedish by Victor
 
-	* src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h: Remove oldest entries from svg
-	cache if cache size is too large
+vinayan 	2013-04-30
 
-2011-06-28  Tim Sutton 
+    add Vinayan to authors
 
-	* : commit e79fe4d46e0565c0e0831262128a8a4222dfd326 Author: Tim
-	Sutton  Date:   Tue Jun 28 11:10:55 2011 +0200
+nyalldawson 	2013-04-30
 
-2011-06-28  Tim Sutton 
+    Add tests for composer item transparency and blending
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsprojectparser.cpp: Added some extra debug info for
-	project path
+Chris Crook 	2013-04-30
 
-2011-06-28  Tim Sutton 
+    Adding subset test and help information
 
-	* src/mapserver/qgswmsserver.cpp: Fixed a bug where map= was not
-	being published in onlineresource url when project files are not in
-	the same dir as cgi
+Chris Crook 	2013-04-30
 
-2011-06-27  Marco Hugentobler 
+    Substring working - tests not in place yet
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp: Support also style-syntax for
-	svg params
+Chris Crook 	2013-04-30
 
-2011-06-27  Juergen E. Fischer 
+    Refactoring code from iterator to provider
 
-	* src/providers/ogr/qgsogrprovider.cpp: fix #3987
+Chris Crook 	2013-04-30
 
-2011-06-27  Marco Hugentobler 
+    Added check of dataSourceUri to tests
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h: Restore svg marker
-	selection
+nyalldawson 	2013-04-30
 
-2011-06-27  Marco Hugentobler 
+    Tweak saturation curve (fix #7655)
 
-	* src/mapserver/qgsmslayercache.cpp: Tweak for layer cache
+olivierdalang 	2013-04-29
 
-2011-06-27  Marco Hugentobler 
+    SVG : some more backgrounds again
 
-	* : commit de5ffb5eaeefdca0dfb1c3eff6cc604d3d70ab1e Author: Marco
-	Hugentobler  Date:   Mon Jun 27
-	09:14:13 2011 +0200
+olivierdalang 	2013-04-29
 
-2011-06-25  Marco Hugentobler 
+    SVG : forgot some
 
-	* src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Notify dialog if
-	svg accepts parameters
+olivierdalang 	2013-04-29
 
-2011-06-25  Marco Hugentobler 
+    SVG : added some backgrounds
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_svgmarker.ui: Change color through svg
-	marker dialog
+olivierdalang 	2013-04-24
 
-2011-06-25  Marco Hugentobler 
+    SVG : separate arrows and wind roses
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h: Use QImage for map and QPicture
-	for composer
+olivierdalang 	2013-04-24
 
-2011-06-24  Marco Hugentobler 
+    SVG : manual correction of GPS icon
 
-	* src/mapserver/qgswmsserver.cpp: Fix for filtering in qgis server
+olivierdalang 	2013-04-24
 
-2011-06-24  Marco Hugentobler 
+    SVG : clean arrows
+    
+    Conflicts:
+images/svg/north_arrows/NorthArrow1.svg           
+images/svg/north_arrows/NorthArrow10.svg           
+images/svg/north_arrows/NorthArrow11.svg           
+images/svg/north_arrows/NorthArrow12.svg           
+images/svg/north_arrows/NorthArrow13.svg           
+images/svg/north_arrows/NorthArrow14.svg           
+images/svg/north_arrows/NorthArrow15.svg           
+images/svg/north_arrows/NorthArrow16.svg           
+images/svg/north_arrows/NorthArrow2.svg           
+images/svg/north_arrows/NorthArrow4.svg           
+images/svg/north_arrows/NorthArrow5.svg           
+images/svg/north_arrows/NorthArrow6.svg           
+images/svg/north_arrows/NorthArrow_blackgreenblack.svg           
+images/svg/north_arrows/NorthArrow_blackwhiteblack.svg           
+images/svg/north_arrows/NorthArrow_blackyellowblack.svg           
+images/svg/north_arrows/NorthArrow_bluegreenblue.svg           
+images/svg/north_arrows/NorthArrow_source.svg           
+images/svg/north_arrows/default.svg           
+images/svg/north_arrows/north-arrow_0_qgis_decoration.svg           
+images/svg/north_arrows/north-arrow_10_with_map_layers.svg           
+images/svg/north_arrows/north-arrow_11_simple_corner.svg           
+images/svg/north_arrows/north-arrow_12_triangular_arrows_with_worldmap.svg           
+images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg           
+images/svg/north_arrows/north-arrow_14_steering_wheel.svg           
+images/svg/north_arrows/north-arrow_15_checkerboard_corner_arrows.svg           
+images/svg/north_arrows/north-arrow_16_corner_arrows_unfilled_with_circle.svg           
+images/svg/north_arrows/north-arrow_17_corner_n_e.svg           
+images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg           
+images/svg/north_arrows/north-arrow_2_simple_half_arrow.svg           
+images/svg/north_arrows/north-arrow_3_simple_symmetric_triangular.svg           
+images/svg/north_arrows/north-arrow_4_double_arrow.svg           
+images/svg/north_arrows/north-arrow_5_arrow_in_circle_small_n.svg           
+images/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg           
+images/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg           
+images/svg/north_arrows/north-arrow_8_checkered.svg           
+images/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg           
 
-	* src/mapserver/qgswmsserver.cpp: Remove debug noise
+olivierdalang 	2013-04-23
 
-2011-06-24  Marco Hugentobler 
+    SVG : add parameters
 
-	* src/mapserver/qgswmsserver.cpp: Fix for filtering in qgis server
+olivierdalang 	2013-04-23
 
-2011-06-24  Marco Hugentobler 
+    SVG : add a directory for crosses
 
-	* src/mapserver/qgswmsserver.cpp: Remove debug noise
+olivierdalang 	2013-04-23
 
-2011-06-23  Juergen E. Fischer 
+    SVG : remove backgrounds, harmonize coulours, harmonize sizes, and add some symbols
 
-	* resources/context_help/QgsFieldCalculator-de_DE,
-	resources/context_help/QgsFieldCalculator-en_US: add context help
+olivierdalang 	2013-04-22
 
-2011-06-23  Juergen E. Fischer 
+    SVG : remove some old-looking svg
 
-	* src/app/qgsfieldcalculator.cpp, src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: 
-	[FEATURE] add function to calculator to determine x/y coordinate of
-	nth point of a line (xat(i) / yat(i); indexs starts with 0; negative
-	indizes apply to end of the line)
+Chris Crook 	2013-04-30
 
-2011-06-23  Marco Hugentobler 
+    Using common code for list of encodings
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h: Add caching, experimental test
-	with QPicture for svg marker
+Matthias Kuhn 	2013-04-29
 
-2011-06-23  Marco Hugentobler 
+    Fix for a2b2e16
 
-	* src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h: Further work on the svg cache
+Matthias Kuhn 	2013-04-29
 
-2011-06-23  Marco Hugentobler 
+    [Fix #7574] [rubberband] Artifacts when using a rubberband with a single point
 
-	* src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegend.h,
-	src/core/composer/qgscomposermap.h, src/gui/qgscomposerview.cpp,
-	src/ui/qgscomposerlegendwidgetbase.ui: Composer legend: support
-	point symbol sizes in map units
+Radim Blazek 	2013-04-29
 
-2011-06-23  Marco Hugentobler 
+    Revert "vector data provider start/stop editing methods"
+    
+    This reverts commit 60b4da443e0998377e0cccbd9113b64555695a41.
 
-	* : commit 1d65377013a6ef2d5288b44f313bc70060817958 Author: Marco
-	Hugentobler  Date:   Thu Jun 23
-	12:03:46 2011 +0200
+Radim Blazek 	2013-04-29
 
-2011-06-21  Juergen E. Fischer 
+    raster cleanup
 
-	* i18n/qgis_de.ts, src/app/legend/qgslegendlayer.cpp: translation
-	fix
+Borys Jurgiel 	2013-04-29
 
-2011-06-21  Juergen E. Fischer 
+    More informative text and tooltip for the "ignore shapefile encoding declaration" combobox
 
-	* src/app/qgsidentifyresults.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	fix endianess detection
+Merge: c5177fc 1113c60
+Borys Jurgiel 	2013-04-29
 
-2011-06-21  Marco Hugentobler 
+    Merge pull request #566 from minorua/fix_cpg
+    
+    Encoding: produce more compatible .cpg files.
 
-	* src/core/CMakeLists.txt, src/core/symbology-ng/qgssvgcache.cpp,
-	src/core/symbology-ng/qgssvgcache.h: Started to implement svg cache
+Merge: 33d13cc 42fc689
+Matthias Kuhn 	2013-04-29
 
-2011-06-20  Marco Hugentobler 
+    Merge pull request #568 from 3nids/layer2map
+    
+    added layerToMapCoordinates for rectangles, and more detailed comments
 
-	* src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp: Fix for using
-	ellipses with renderers other than single
+Denis Rouzaud 	2013-04-29
 
-2011-06-20  Marco Hugentobler 
+    added layerToMapCoordinates for rectangles, and more detailed comments
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_svgmarker.ui: Add line edit to select svg
-	marker
+nyalldawson 	2013-04-29
 
-2011-06-20  Marco Hugentobler 
+    Add blending mode for overview frame, option to invert overview frame
 
-	* src/core/qgsproject.cpp: Fix for embeding layer and groups from
-	project with relative pathes
+Radim Blazek 	2013-04-29
 
-2011-06-16  Marco Hugentobler 
+    raster cleanup
 
-	* src/app/legend/qgslegend.cpp: Fix bug in case of embeding from
-	other projects with relative path
+Salvatore Larosa 	2013-04-29
 
-2011-06-19  Juergen E. Fischer 
+    [pyqgis-console] allows comments and quotes folding in editor lexer
 
-	* i18n/qgis_de.ts: german translation update
+Merge: 723ad4c 1959182
+Emilio Loi 	2013-04-29
 
-2011-06-19  NathanW 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+python/console/console_editor.py           
 
-	* src/app/qgslabelinggui.cpp, src/gui/qgsexpressionbuilder.cpp,
-	src/gui/qgsexpressionbuilder.h: Use selected text in label combo box
-	for start off expression text
+Merge: 2232c3d 1959182
+Chris Crook 	2013-04-29
 
-2011-06-18  Marco Hugentobler 
+    Merge branch 'master' into delimited_text_bug_fixes_2
 
-	* src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgspostrequesthandler.cpp,
-	src/mapserver/qgspostrequesthandler.h: Add license header to
-	postrequesthandler, clean old code section
+Minoru Akagi 	2013-04-28
 
-2011-06-18  Marco Hugentobler 
+    fix .cpg file contents
 
-	* : commit 2a05b5430f3776c9c8a0767157383bc6a3ebd221 Author: Marco
-	Hugentobler  Date:   Sat Jun 18 22:34:25
-	2011 +0200
+Salvatore Larosa 	2013-04-29
 
-2011-06-18  Marco Hugentobler 
+    [pyqgis-console] small fix for show/hide editor action
 
-	* src/mapserver/CMakeLists.txt, src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgsgetrequesthandler.h,
-	src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgshttprequesthandler.h,
-	src/mapserver/qgssoaprequesthandler.cpp: Support requests with http
-	post. Up to now, only SOAP requests over HTTP POST have been
-	supported
+Merge: 71c9d96 533030f
+Nathan Woodrow 	2013-04-28
 
-2011-06-06  Sergey Yakushev 
+    Merge pull request #565 from nyalldawson/new_functions
+    
+    New color functions (from hsl, hsv and cmyk), new regexp_match function
 
-	* src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolmeasureangle.h: Fix #3866 for measure angle tool
+nyalldawson 	2013-04-29
 
-2011-06-18  Radim Blazek 
+    Add regexp_match function, improve help for regexp_replace function
 
-	* : commit 9028bf7d7d029e52aad2381898e0ecfc4b6400a3 Author: Radim
-	Blazek  Date:   Sat Jun 18 10:44:32 2011
-	+0200
+nyalldawson 	2013-04-28
 
-2011-06-18  Marco Hugentobler 
+    Add color_cmyk and color_cmyka functions
 
-	* src/core/composer/qgscomposerlegend.cpp: More legend cleanup
+nyalldawson 	2013-04-27
 
-2011-06-17  Marco Hugentobler 
+    Add color_hsv and color_hsva functions
 
-	* src/core/composer/qgscomposerlegend.cpp: Better layout for
-	composer legend
+nyalldawson 	2013-04-27
 
-2011-06-18  Marco Hugentobler 
-
-	* src/core/composer/qgscomposerlegend.cpp: More legend cleanup
-
-2011-06-18  NathanW 
-
-	* src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp: Fix seg
-	fault with using empty expression labels, added checks for empty
-	expression
-
-2011-06-17  Marco Hugentobler 
-
-	* src/core/composer/qgscomposerlegend.cpp: Better layout for
-	composer legend
-
-2011-06-17  Juergen E. Fischer 
-
-	* src/core/qgsmaplayer.h, src/core/qgsmaprenderer.h,
-	src/core/qgsprojectproperty.h, src/core/qgsrasterdataprovider.h,
-	src/core/renderer/qgsrenderer.h,
-	src/mapserver/qgsmslayerbuilder.cpp,
-	src/mapserver/qgssldparser.cpp, src/mapserver/qgssldrenderer.h,
-	src/plugins/grass/qgsgrassedittools.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/osm/osmprovider.cpp, src/providers/osm/osmprovider.h,
-	src/providers/osm/osmrenderer.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.h: fix windows
-	build
-
-2011-06-17  Marco Hugentobler 
-
-	* src/core/composer/qgscomposerlegend.cpp: Better consideration of
-	large point symbols in composer legend
-
-2011-06-17  Marco Hugentobler 
-
-	* src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegenditem.cpp: Fix for composer legend
-	issues, e.g. ticket #3346
-
-2011-06-16  Juergen E. Fischer 
-
-	* src/core/qgslogger.cpp, src/core/qgslogger.h,
-	src/core/qgsvectorfilewriter.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp: fix
-	warnings
-
-2011-06-16  Juergen E. Fischer 
-
-	* CMakeLists.txt, python/core/conversions.sip,
-	python/core/qgsfeature.sip, python/core/qgsspatialindex.sip,
-	python/core/qgsvectordataprovider.sip,
-	python/core/qgsvectorlayer.sip, python/core/qgsvectoroverlay.sip,
-	src/analysis/interpolation/Bezier3D.h,
-	src/analysis/interpolation/MathUtils.cc,
-	src/analysis/interpolation/ParametricLine.cc,
-	src/analysis/vector/qgsgeometryanalyzer.cpp,
-	src/analysis/vector/qgsoverlayanalyzer.cpp,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposermapwidget.cpp,
-	src/app/composer/qgscomposerpicturewidget.cpp,
-	src/app/composer/qgscompositionwidget.cpp,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegenditem.cpp,
-	src/app/legend/qgslegenditem.h,
-	src/app/legend/qgslegendpropertygroup.h,
-	src/app/legend/qgslegendsymbologygroup.cpp,
-	src/app/ogr/qgsopenvectorlayerdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h, src/app/qgisapp.cpp,
-	src/app/qgisappinterface.cpp, src/app/qgsattributetypedialog.cpp,
-	src/app/qgsbookmarks.cpp, src/app/qgsconfigureshortcutsdialog.cpp,
-	src/app/qgscustomization.cpp, src/app/qgsfieldcalculator.cpp,
-	src/app/qgsgraduatedsymboldialog.cpp,
-	src/app/qgshandlebadlayers.cpp, src/app/qgsidentifyresults.cpp,
-	src/app/qgsidentifyresults.h, src/app/qgslabelinggui.cpp,
-	src/app/qgslabelpreview.cpp, src/app/qgsmaptooladdpart.cpp,
-	src/app/qgsmaptoolannotation.cpp, src/app/qgsmaptoolcapture.cpp,
-	src/app/qgsmaptoolchangelabelproperties.cpp,
-	src/app/qgsmaptooldeletepart.cpp, src/app/qgsmaptooldeletepart.h,
-	src/app/qgsmaptooldeletering.cpp, src/app/qgsmaptooldeletering.h,
-	src/app/qgsmaptooldeletevertex.cpp, src/app/qgsmaptoolidentify.cpp,
-	src/app/qgsmaptoolmovefeature.cpp, src/app/qgsmaptoolnodetool.cpp,
-	src/app/qgsmaptoolnodetool.h, src/app/qgsmaptoolrotatelabel.cpp,
-	src/app/qgsmaptoolrotatepointsymbols.cpp,
-	src/app/qgsmaptoolrotatepointsymbols.h,
-	src/app/qgsmaptoolselectrectangle.cpp,
-	src/app/qgsmaptoolselectutils.cpp, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsmergeattributesdialog.cpp,
-	src/app/qgspastetransformations.cpp, src/app/qgspluginregistry.cpp,
-	src/app/qgsrastercalcdialog.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgssinglesymboldialog.cpp, src/app/qgssnappingdialog.cpp,
-	src/app/qgstilescalewidget.cpp, src/app/qgstipfactory.cpp,
-	src/app/qgsundowidget.cpp,
-	src/app/spatialite/qgsnewspatialitelayerdialog.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/browser/qgsbrowser.cpp, src/browser/qgsbrowsermodel.cpp,
-	src/core/composer/qgscomposerarrow.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritemgroup.cpp,
-	src/core/composer/qgscomposeritemgroup.h,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposerpicture.cpp,
-	src/core/composer/qgscomposerscalebar.cpp,
-	src/core/composer/qgscomposershape.cpp,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h,
-	src/core/composer/qgscomposition.cpp,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h,
-	src/core/composer/qgsnumericscalebarstyle.cpp,
-	src/core/composer/qgspaperitem.cpp,
-	src/core/gps/qextserialport/posix_qextserialport.cpp,
-	src/core/gps/qextserialport/qextserialport.cpp,
-	src/core/gps/qgsgpsdconnection.cpp,
-	src/core/gps/qgsgpsdetector.cpp,
-	src/core/gps/qgsnmeaconnection.cpp, src/core/gps/tok.c,
-	src/core/gps/tok.h, src/core/pal/feature.cpp, src/core/pal/pal.cpp,
-	src/core/pal/pointset.cpp, src/core/qgsattributeaction.cpp,
-	src/core/qgscentralpointpositionmanager.cpp,
-	src/core/qgscoordinatetransform.cpp, src/core/qgsdataitem.h,
-	src/core/qgsdataprovider.h, src/core/qgsdiagram.cpp,
-	src/core/qgsdiagramrendererv2.cpp, src/core/qgsdiagramrendererv2.h,
-	src/core/qgsfeature.cpp, src/core/qgsfeature.h,
-	src/core/qgsgeometry.cpp, src/core/qgshttptransaction.cpp,
-	src/core/qgslabel.cpp, src/core/qgslogger.h,
-	src/core/qgsmaplayer.cpp, src/core/qgsmaplayerregistry.cpp,
-	src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h,
-	src/core/qgspalgeometry.h, src/core/qgspallabeling.cpp,
-	src/core/qgspalobjectpositionmanager.cpp,
-	src/core/qgspluginlayerregistry.cpp,
-	src/core/qgsprojectfiletransform.cpp,
-	src/core/qgsprojectproperty.h, src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h, src/core/qgsrasterprojector.cpp,
-	src/core/qgssnapper.h, src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorfilewriter.cpp,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/core/qgsvectorlayerundocommand.cpp,
-	src/core/qgsvectorlayerundocommand.h,
-	src/core/qgsvectoroverlay.cpp, src/core/qgsvectoroverlay.h,
-	src/core/raster/qgscolorrampshader.cpp,
-	src/core/raster/qgsfreakoutshader.cpp,
-	src/core/raster/qgspseudocolorshader.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrastershaderfunction.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsrenderer.h,
-	src/core/renderer/qgssinglesymbolrenderer.h,
-	src/core/spatialindex/geometry/LineSegment.cc,
-	src/core/spatialindex/geometry/Point.cc,
-	src/core/spatialindex/geometry/Region.cc,
-	src/core/spatialindex/include/PointerPool.h,
-	src/core/spatialindex/qgsspatialindex.cpp,
-	src/core/spatialindex/qgsspatialindex.h,
-	src/core/spatialindex/rtree/Index.cc,
-	src/core/spatialindex/rtree/Leaf.cc,
-	src/core/spatialindex/rtree/Node.cc,
-	src/core/spatialindex/rtree/Node.h,
-	src/core/spatialindex/rtree/PointerPoolNode.h,
-	src/core/spatialindex/rtree/RTree.cc,
-	src/core/spatialindex/storagemanager/MemoryStorageManager.cc,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.h,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/core/symbology/qgsmarkercatalogue.cpp, src/crssync/main.cpp,
-	src/gui/attributetable/qgsattributetabledelegate.cpp,
-	src/gui/attributetable/qgsattributetabledelegate.h,
-	src/gui/attributetable/qgsattributetablefiltermodel.cpp,
-	src/gui/attributetable/qgsattributetableidcolumnpair.h,
-	src/gui/attributetable/qgsattributetablememorymodel.cpp,
-	src/gui/attributetable/qgsattributetablememorymodel.h,
-	src/gui/attributetable/qgsattributetablemodel.cpp,
-	src/gui/attributetable/qgsattributetablemodel.h,
-	src/gui/attributetable/qgsattributetableview.cpp,
-	src/gui/qgisgui.cpp, src/gui/qgsannotationitem.cpp,
-	src/gui/qgscomposerview.cpp, src/gui/qgsformannotationitem.cpp,
-	src/gui/qgsformannotationitem.h, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapcanvasitem.cpp, src/gui/qgsmapoverviewcanvas.cpp,
-	src/gui/qgsmaptool.cpp, src/gui/qgsmaptoolemitpoint.cpp,
-	src/gui/qgsmessageviewer.cpp,
-	src/gui/qgsprojectbadlayerguihandler.cpp,
-	src/gui/qgsprojectionselector.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp,
-	src/helpviewer/qgshelpviewer.cpp, src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgsinterpolationlayerbuilder.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsremotedatasourcebuilder.cpp,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/mapserver/qgssentdatasourcebuilder.cpp,
-	src/mapserver/qgssldrenderer.cpp, src/mapserver/qgssldrenderer.h,
-	src/mapserver/qgssldrule.cpp,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgswmsserver.cpp,
-	src/plugins/coordinate_capture/coordinatecapture.cpp,
-	src/plugins/coordinate_capture/coordinatecapturemaptool.cpp,
-	src/plugins/copyright_label/plugin.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/diagram_overlay/qgsbardiagramfactory.h,
-	src/plugins/diagram_overlay/qgsdiagramfactory.cpp,
-	src/plugins/diagram_overlay/qgsdiagramoverlay.cpp,
-	src/plugins/diagram_overlay/qgsdiagramrendererwidget.h,
-	src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp,
-	src/plugins/diagram_overlay/qgspiediagramfactory.cpp,
-	src/plugins/diagram_overlay/qgspiediagramfactory.h,
-	src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp,
-	src/plugins/diagram_overlay/qgssvgdiagramfactory.h,
-	src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp,
-	src/plugins/diagram_overlay/qgswkndiagramfactory.h,
-	src/plugins/dxf2shp_converter/builder.cpp,
-	src/plugins/dxf2shp_converter/dxf2shpconverter.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h,
-	src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcplist.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/gps_importer/qgsbabelformat.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/grass/qgsgrassattributes.cpp,
-	src/plugins/grass/qgsgrassbrowser.cpp,
-	src/plugins/grass/qgsgrassedittools.cpp,
-	src/plugins/grass/qgsgrassedittools.h,
-	src/plugins/grass/qgsgrassmapcalc.cpp,
-	src/plugins/grass/qgsgrassmapcalc.h,
-	src/plugins/grass/qgsgrassmodel.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h,
-	src/plugins/grass/qgsgrassnewmapset.cpp,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassshell.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/plugins/interpolation/qgsinterpolationdialog.cpp,
-	src/plugins/interpolation/qgsinterpolationplugin.cpp,
-	src/plugins/north_arrow/plugin.cpp,
-	src/plugins/north_arrow/plugingui.cpp,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/offline_editing/offline_editing.h,
-	src/plugins/offline_editing/offline_editing_plugin_gui.cpp,
-	src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h, src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h,
-	src/plugins/roadgraph/utils.cpp, src/plugins/roadgraph/utils.h,
-	src/plugins/scale_bar/plugin.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spit/qgsshapefile.cpp, src/plugins/spit/qgsspit.h,
-	src/plugins/spit/qgsspitplugin.cpp,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.h,
-	src/plugins/wfs/qgswfsplugin.cpp,
-	src/plugins/wfs/qgswfssourceselect.cpp,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/gpx/gpsdata.cpp, src/providers/gpx/gpsdata.h,
-	src/providers/gpx/qgsgpxprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h,
-	src/providers/memory/qgsmemoryprovider.cpp,
-	src/providers/memory/qgsmemoryprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/osm/osmhandler.cpp,
-	src/providers/osm/osmprovider.cpp,
-	src/providers/osm/osmrenderer.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp,
-	src/providers/wfs/qgswfsdata.cpp, src/providers/wfs/qgswfsdata.h,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wfs/qgswfsprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmssourceselect.cpp: [FEATURE] support 64bit
-	feature ids
-
-2011-06-16  Radim Blazek 
-
-	* src/browser/qgsbrowsermodel.cpp: drag layer fix
-
-2011-06-16  Radim Blazek 
-
-	* : commit 608d3947f2b06178ff42de08e4b96e5a8045f033 Author: Marco
-	Hugentobler  Date:   Thu Jun 16
-	16:17:48 2011 +0200
-
-2011-06-16  Marco Hugentobler 
-
-	* src/core/qgslogger.h, src/mapserver/qgis_map_serv.cpp: Avoid
-	infinite recursion if no log file variable set
-
-2011-06-16  Marco Hugentobler 
-
-	* src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h, src/mapserver/qgswmsserver.cpp: 
-	Support for raster legend in composer
-
-2011-06-16  Marco Hugentobler 
-
-	* : merge conflict
-
-2011-06-16  Giuseppe Sucameli 
-
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/widgetContour.ui: Correct the output
-	label's text in GdalTools Contour
-
-2011-06-15  Marco Hugentobler 
-
-	* src/app/legend/qgslegend.cpp, src/core/raster/qgsrasterlayer.cpp: 
-	Collapse raster symbology items by default, check for graystile
-	raster first and for raster shaders in a second part
-
-2011-06-15  Marco Hugentobler 
+    Add color_hsl and color_hsla functions
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/ui/symbollayer/widget_ellipse.ui: Fix preview with data defined
-	settings, indentation
+Salvatore Larosa 	2013-04-26
 
-2011-06-15  Marco Hugentobler 
+    [pyqgis-console ] adds more options to settings dialog:
+    - reorganized settings dialog
+    - added option autosave script before running
+    - added options for autocompletion code (from Document, from APIs, from Doc and API)
+    - minor fixes
 
-	* python/gui/symbology-ng-gui.sip: Fix python bindings
+Werner Macho 	2013-04-28
 
-2011-06-15  Marco Hugentobler 
+    translation update: fr by JRM
 
-	* src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp,
-	src/ui/symbollayer/widget_ellipse.ui: Add tooltips for shapes
+Merge: 6b9bc64 9d93514
+Matthias Kuhn 	2013-04-28
 
-2011-06-15  Marco Hugentobler 
+    Merge pull request #564 from vinayan/fixRubberband
+    
+    [Fix #7728] - QgsRubberband addGeometry does not add multipart geometries to existing points
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.h,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp: Forgot to
-	add support for data defined shape
+Werner Macho 	2013-04-28
 
-2011-06-15  Marco Hugentobler 
+    translation update: Danish by Jacob
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/core/raster/qgscontrastenhancement.h,
-	src/core/raster/qgsfreakoutshader.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrastershaderfunction.h: Improve legend for
-	pseudocolor, freakout, grayscale
+Matthias Kuhn 	2013-04-28
 
-2011-06-15  Sergey Yakushevs 
+    Allow adding QToolButton's to the toolbars
+     * iface.addToolBarWidget()
+     * iface.addRasterToolBarWidget()
+     * iface.addVectorToolBarWidget()
+     * iface.addDatabaseToolBarWidget()
+     * iface.addWebToolBarWidget()
 
-	* src/analysis/network/qgslinevectorlayerdirector.cpp: fix
+Etienne Tourigny 	2013-04-28
 
-2011-06-15  Sergey Yakushevs 
+    restore zip raster layer style test - still needs a test for vector layers
 
-	* src/analysis/network/qgslinevectorlayerdirector.cpp: fix
+Etienne Tourigny 	2013-04-28
 
-2011-06-14  Marco Hugentobler 
+    remove invalid layers from zip test files
 
-	* src/core/raster/qgspseudocolorshader.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrastershaderfunction.h: Symbol items for pseudo
-	color shader
+vinayan 	2013-04-28
 
-2011-06-14  Marco Hugentobler 
+    fix QgsRubberband.addGeometry when adding multipart geometries
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/providers/gdal/qgsgdalprovider.cpp: Value label for colortable
-	rasters
+vinayan 	2013-04-28
 
-2011-06-14  Marco Hugentobler 
+    fix move features issue with point geometries
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: [FEATURE]: Show colormap items in
-	legend
+vinayan 	2013-04-28
 
-2011-06-14  Sergey Yakushevs 
+    fix rotate features issue with point geometries
 
-	* src/analysis/network/qgslinevectorlayerdirector.cpp,
-	src/analysis/network/qgslinevectorlayerdirector.h: optimization hit
+Borys Jurgiel 	2013-04-28
 
-2011-06-14  Radim Blazek 
+    Plugin installer: add ?qgis=[QGIS_VERSION] GET parameter to each repository URL to allow filtering also on reposiotory side
 
-	* : resolved qgsbrowsermodel merge conflicts
+Borys Jurgiel 	2013-04-28
 
-2011-06-13  NathanW 
+    Plugin installer: fix support for qgisMaximumVersion tag.
 
-	* src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp,
-	src/core/qgssearchtreenode.cpp, src/core/qgsvectorlayer.cpp: Revert
-	changes related to v1 labeling. Only going to support v2 labels for
-	now.  Only return needed attributes for labeling to select (like
-	before).  Add handlers for Ok and Cancel in expression dialog box
-	(only temp)
+Juergen E. Fischer 	2013-04-27
 
-2011-06-12  Tim Sutton 
+    german translation update
 
-	* INSTALL, doc/INSTALL.html, doc/linux.t2t: Fixed some old svn
-	references and typos in INSTALL docs
+Werner Macho 	2013-04-27
 
-2011-06-12  Tim Sutton 
+    translation update: gl_ES by Xan
 
-	* src/plugins/georeferencer/qgsimagewarper.cpp: [BACKPORT] Added
-	missing include for qgslogger
+Merge: 83f3fc6 a7b52d0
+Werner Macho 	2013-04-27
 
-2011-06-11  Tim Sutton 
+    Merge pull request #472 from jdugge/master
+    
+    Interface elements for specifying raster resolution in GDAL Rasterize plugin
 
-	* src/plugins/georeferencer/qgsimagewarper.cpp: [BACKPORT] Removed
-	assert too
+Werner Macho 	2013-04-27
 
-2011-06-11  Tim Sutton 
+    translation update da_DK by Jacob
 
-	* src/plugins/georeferencer/qgsimagewarper.cpp: [BACKPORT] Partially
-	address https://bugzilla.redhat.com/show_bug.cgi?id=712620 - don't
-	assert when things go wrong. Still needs to give user some decent
-	feedback somehow but at least it shouldnt crash QGIS
+Victor Olaya 	2013-04-27
 
-2011-06-10  Marco Hugentobler 
+    [sextante] added OTB algorithms to simplified list
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.h,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp: Improve data
-	defined rotation
+Juergen E. Fischer 	2013-04-27
 
-2011-06-10  Marco Hugentobler 
+    osgeo4w: rename executables to ...-bin.exe to solve clash with .bat
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp: Fix ellipse
-	rotation
+Victor Olaya 	2013-04-27
 
-2011-06-10  Marco Hugentobler 
+    [sextante] Improvements in commander
 
-	* python/core/symbology-ng-core.sip,
-	python/gui/symbology-ng-gui.sip,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.h,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h,
-	src/ui/symbollayer/widget_ellipse.ui: started rotation / data
-	defined rotation
+Victor Olaya 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [sextante] fixed problem in otb with filepaths containing whitespaces.
+    
+    Removed outdated otb descriptions
 
-	* : commit d967b71c9139d3cf3821c374c2b151fb69aeb2f0 Author: Tim
-	Sutton  Date:   Fri Jun 10 16:12:08 2011 +0200
+Merge: f7dc548 f384277
+Chris Crook 	2013-04-27
 
-2011-06-10  Tim Sutton 
+    Merge branch 'master' into delimited_text_bug_fixes_2
 
-	* src/core/qgsmaprenderer.cpp: Added pre-render layer count to
-	maprenderer
+Emilio Loi 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [FEATURE] Load and Save SLD & QML styles to DB
+    Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
+    merge with master f3842775a5147b7a8da1639a4bec667a769b7fac
 
-	* src/core/qgsmaprenderer.cpp: Improve formatting of debug output
-	for maprenderer map dimentions
+Merge: 7219fb7 f384277
+Emilio Loi 	2013-04-26
 
-2011-06-05  Tim Sutton 
+    pre merge with master
+    
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+python/console/console_editor.py           
+src/core/qgsvectordataprovider.h           
+src/core/qgsvectorfilewriter.cpp           
 
-	* src/mapserver/qgswmsserver.cpp: added debugging info to mapserver
-	while trying to resolve blank rendering issues
+Merge: 02fa729 f7cce9c
+Borys Jurgiel 	2013-04-26
 
-2011-06-10  Sergey Yakushev 
+    Merge pull request #561 from minorua/create_shape
+    
+    set SHAPE_ENCODING to "" when creating new shapefile
 
-	* src/plugins/roadgraph/linevectorlayerdirector.cpp: add support for
-	WKBMultiLineString geometries in RoadGraph plugin
+Etienne Tourigny 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    add temporary output for zip test
 
-	* src/core/qgsmaprenderer.cpp: Improve formatting of debug output
-	for maprenderer map dimentions
+Minoru Akagi 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    set SHAPE_ENCODING to "" when creating new shapefile (follows up 4fb9879)
 
-	* src/core/qgslogger.cpp: Run astyle to cleanup formatting
+Emilio Loi 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [FEATURE] Load and Save SLD & QML styles to DB
+    Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
+    (bug fixes and rollback on doc files)
 
-	* src/core/qgslogger.cpp, src/core/qgslogger.h: [FEATURE] Added
-	support for logging to a file. To enable it, set the QGIS_LOG_FILE
-	environment variable to a writable file on your file system. When
-	using the QGIS Mapserver, you can enable logging by adding a
-	directive such as 'SetEnv QGIS_LOG_FILE /tmp/qgislog.txt' to the
-	cgi-bin section of your apache config file.
+Emilio Loi 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [FEATURE] Load and Save SLD & QML styles to DB
+    Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
 
-	* src/core/qgslogger.cpp: Run astyle to cleanup formatting
+Alexander Bruy 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [sextante] add missed CMakeLists
 
-	* : commit 4bcddc19298efe5e0f39e5bebc5290c93204092f Author: Tim
-	Sutton  Date:   Fri Jun 10 12:23:53 2011 +0200
+Victor Olaya 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    [sextante] fixed error due to wrong import
 
-	* src/app/qgsprojectproperties.cpp: Don't use exponential notation
-	for wms extents display
+Chris Crook 	2013-04-26
 
-2011-06-10  Tim Sutton 
+    Let users know if no data displayed because all records are badly formatted
 
-	* src/mapserver/qgis_map_serv.cpp: Added warning that .qgs extension
-	may be missing
+Larry Shaffer 	2013-04-25
 
-2011-06-10  Tim Sutton 
+    Fix for #3743, georeferencer: can't set map coords from map canvas on Mac
 
-	* : commit b2fa1b8952c095454eae27130792014baf41ae75 Author: Tim
-	Sutton  Date:   Fri Jun 10 09:21:28 2011 +0200
+Larry Shaffer 	2013-04-25
 
-2011-06-10  Marco Hugentobler 
+    Small cleanup for e0838b0
 
-	* src/plugins/CMakeLists.txt,
-	src/plugins/zonal_statistics/CMakeLists.txt,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.h,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialogbase.ui,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.h: [FEATURE]:
-	zonal statistics plugin
+Chris Crook 	2013-04-26
 
-2011-06-10  Marco Hugentobler 
+    Fixing potentially very long field names when reading arbitrary data from CSV files - reduced max length to 200
 
-	* src/plugins/CMakeLists.txt,
-	src/plugins/zonal_statistics/CMakeLists.txt,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialog.h,
-	src/plugins/zonal_statistics/qgszonalstatisticsdialogbase.ui,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp,
-	src/plugins/zonal_statistics/qgszonalstatisticsplugin.h: [FEATURE]:
-	zonal statistics plugin
+Chris Crook 	2013-04-26
 
-2011-06-06  Sergey Yakushev 
+    Fixing problem with very long data fields corrupting preview table (Qt framework not handling very long strings?)
 
-	* src/plugins/roadgraph/utils.cpp: fix RoadGraph plugin "path not
-	found" error when start and stop points are equal
+Merge: 7603f3e b57841f
+Chris Crook 	2013-04-26
 
-2011-06-07  Juergen E. Fischer 
+    Merge branch 'master' into delimited_text_bug_fixes_2
 
-	* resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewConnection-es_ES,
-	resources/context_help/QgsNewConnection-fr_FR,
-	resources/context_help/QgsNewConnection-it_IT,
-	resources/context_help/QgsNewConnection-ja_JP,
-	resources/context_help/QgsNewConnection-pl_PL,
-	resources/context_help/QgsNewConnection-pt_BR,
-	resources/context_help/QgsNewConnection-ru_RU,
-	resources/context_help/QgsNewConnection-sk_SK,
-	resources/context_help/QgsNewConnection-sv_SE,
-	resources/context_help/QgsPgNewConnection-de_DE,
-	resources/context_help/QgsPgNewConnection-en_US,
-	resources/context_help/QgsPgNewConnection-es_ES,
-	resources/context_help/QgsPgNewConnection-fr_FR,
-	resources/context_help/QgsPgNewConnection-it_IT,
-	resources/context_help/QgsPgNewConnection-ja_JP,
-	resources/context_help/QgsPgNewConnection-pl_PL,
-	resources/context_help/QgsPgNewConnection-pt_BR,
-	resources/context_help/QgsPgNewConnection-ru_RU,
-	resources/context_help/QgsPgNewConnection-sk_SK,
-	resources/context_help/QgsPgNewConnection-sv_SE,
-	src/providers/postgres/qgspostgresprovider.cpp: document impact of
-	using estimated table metadata (and revert last commit)
+Merge: 21fd0f2 fd57ffa
+Nathan Woodrow 	2013-04-25
 
-2011-06-07  Gary Sherman 
+    Merge pull request #531 from ccrook/colour_functions
+    
+    Colour functions
 
-	* src/providers/postgres/qgspostgresprovider.cpp: Fix feature count
-	for postgres provider so it doesn't use estimated metadata when
-	reporting results of a subset in the query builder
+Merge: 0372e4b 21fd0f2
+Chris Crook 	2013-04-26
 
-2011-06-05  Tim Sutton 
+    Merge branch 'master' into colour_functions
 
-	* CODING, INSTALL, doc/CODING.t2t, doc/INSTALL.html, doc/index.dox,
-	doc/index.html: Updated references to bug tracker to point to hub
-	website
+Victor Olaya 	2013-04-13
 
-2011-06-03  Alexander Bruy 
+    [sextante] added commander
 
-	* src/core/qgslabel.h: remove unimplemented
-	QgsLabel::setLabelFieldName()
+Chris Crook 	2013-04-26
 
-2011-06-03  Juergen E. Fischer 
+    Fixes bug #7688
 
-	* src/app/qgsmeasuredialog.cpp, src/app/qgsmeasuredialog.h: fix
-	#3866
+Borys Jurgiel 	2013-04-25
 
-2011-06-03  Marco Hugentobler 
+    Set the ENCODING layer creation option when creating a new empty Shapefile. Thanks to Minoru Akagi.
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h: Don't list join fields to
-	facilitate 'save as' function (fixes #3857). Don't display the query
-	builder if a layer has joins (#3858)
+Borys Jurgiel 	2013-04-25
 
-2011-06-10  Tim Sutton 
+    Always set "SHAPE_ENCODING" GDAL config option to "" in QgsVectorFileWriter (follows up commit:c0551a6)
 
-	* : commit 1b1552812dc30337c4f9c6eb3a552d37f7dc3c18 Author: Marco
-	Hugentobler  Date:   Tue Jun 7 22:25:53
-	2011 +0200
+Etienne Tourigny 	2013-04-25
 
-2011-06-07  Marco Hugentobler 
+    fix cpt-city loading of invalid (non-existent) ramps in Seleections
 
-	* src/app/legend/qgslegend.cpp: Avoid unnecessary canvas refreshes
-	when adding group to legend
+Etienne Tourigny 	2013-04-25
 
-2011-06-07  Marco Hugentobler 
+    add simple help to cpt-city dialog
 
-	* src/mapserver/qgswmsserver.cpp: Zoom to filtered layers in wms
-	server if BBOX parameter missing
+Etienne Tourigny 	2013-04-25
 
-2011-06-06  Marco Hugentobler 
+    add ramp count to selection info label
 
-	* src/core/qgsproject.cpp: Reformating, fix for project cleaning
+Etienne Tourigny 	2013-04-23
 
-2011-06-06  Marco Hugentobler 
+    change QGis to QGIS
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp: Fix order of
-	embedded layers in groups
+Etienne Tourigny 	2013-04-22
 
-2011-06-06  Marco Hugentobler 
+    add cpt-city selections to distribution
 
-	* src/app/legend/qgslegend.cpp, src/app/qgsembedlayerdialog.cpp,
-	src/core/qgsproject.cpp: More safety checks
+Juergen E. Fischer 	2013-04-25
 
-2011-06-05  Marco Hugentobler 
+    osgeo4w: make batch files location independant
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigcache.cpp, src/mapserver/qgsconfigcache.h,
-	src/mapserver/qgsprojectparser.cpp: Support embedded layers and
-	groups in server
+Salvatore Larosa 	2013-04-25
 
-2011-06-03  Marco Hugentobler 
+    [pyqgis-console] fix object inspector on windows 7
+    - minor fixes
 
-	* src/app/qgsembedlayerdialog.cpp, src/ui/qgisapp.ui: Move embed
-	action to layer menu
+Merge: e0838b0 4f54664
+vinayan 	2013-04-25
 
-2011-06-03  Marco Hugentobler 
+    Merge pull request #556 from vinayan/splitVector
+    
+    [Fix #7618] - split vector layer does not work in master
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/ui/qgsembedlayerdialogbase.ui: 
-	Improvements to embed dialogs and stability
+vinayan 	2013-04-25
 
-2011-06-01  Marco Hugentobler 
+    ftools-fix  split vector layer
 
-	* src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp,
-	src/app/legend/qgslegend.h, src/app/qgisapp.cpp,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/core/qgsproject.h,
-	src/ui/qgsembedlayerdialogbase.ui: Wire in dialog to select embedded
-	groups and layers
+Nathan Woodrow 	2013-04-26
 
-2011-05-31  Marco Hugentobler 
+    Add workaround for loading forms with custom widgets from PyQt4
+    
+More information: qt-project.org/forums/viewthread/27098/           
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp, src/core/qgsproject.cpp, src/core/qgsproject.h: 
-	Add support for embedded legend groups
+Matthias Kuhn 	2013-04-14
 
-2011-05-31  Marco Hugentobler 
+    Enable pal label testing to qgis_bench
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/core/qgsproject.cpp, src/core/qgsproject.h: Show embedded layers
-	in italic
+Larry Shaffer 	2013-04-24
 
-2011-05-31  Marco Hugentobler 
+    Make sure Analysis menu (sextante) shows up before Window menu on Mac
 
-	* src/app/qgisapp.cpp, src/core/qgsproject.cpp,
-	src/core/qgsproject.h: remove more redundancy in qgsproject
+Larry Shaffer 	2013-04-24
 
-2011-05-30  Marco Hugentobler 
+    Small update to Mac notes in INSTALL
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayer.h, src/core/qgsproject.cpp,
-	src/core/qgsproject.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/ui/qgisapp.ui: embedding of
-	single layer
+Werner Macho 	2013-04-24
 
-2011-06-09  Marco Hugentobler 
+    translation update: cz by Jan
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp: Support data
-	defined fields in ellipse renderer
+D'Hont René-Luc 	2013-04-24
 
-2011-06-06  Sergey Yakushev 
+    shapefiles served with qgis wfs server are completely wrong #7536
+    
+    The bug is due to an inversion between tuple and coordinates separator in Polygon
+    coordinates element.
 
-	* src/plugins/roadgraph/utils.cpp: fix RoadGraph plugin "path not
-	found" error when start and stop points are equal
+olivierdalang 	2013-04-24
 
-2011-06-09  Sergey Yakushevs 
+    [FEATURE] allows to store SQL queries in the DB manager
 
-	* python/analysis/network/qgsgraphbuilder.sip,
-	python/analysis/network/qgsgraphdirector.sip: fix sip module
+Radim Blazek 	2013-04-24
 
-2011-06-09  Marco Hugentobler 
+    common raster enums moved to raster namespace
 
-	* src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/ui/symbollayer/widget_ellipse.ui: Add and wire in ellipse symbol
-	layer widget
+Juergen E. Fischer 	2013-04-24
 
-2011-06-09  Marco Hugentobler 
+    wmts: fix dimension support
 
-	* src/core/CMakeLists.txt,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsellipsesymbollayerv2.h: Integrated
-	qgsellipsesymbollayer
+Victor Olaya 	2013-04-24
 
-2011-06-09  Marco Hugentobler 
+    [sextante] fixed #7694. v.clean now accepts decimal values as input
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h: Ported single and graduated
-	symbol renderer to use usedAttributes() functions of symbol
+Victor Olaya 	2013-04-24
 
-2011-06-08  Marco Hugentobler 
+    [sextante] fixed missing + icons in modeler
 
-	* src/app/qgsannotationwidget.cpp,
-	src/core/symbology-ng/qgssymbollayerv2registry.h,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.h,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.cpp: Pass pointer to vectorlayer to all simbol widgets
+Alexander Bruy 	2013-04-24
 
-2011-06-08  Marco Hugentobler 
+    [sextante] wrap long lines in help file
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h, src/gui/qgsannotationitem.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h: Include QgsFeature pointer to symbol render context. Bindings
-	not adapted yet
+Alexander Bruy 	2013-04-24
 
-2011-06-08  Tim Sutton 
+    [sextante] add output to r.stream.stats module
 
-	* : commit ebfef6ff1952c38170ace538d1e1a1b2f6458460 Author: Marco
-	Hugentobler  Date:   Tue Jun 7 22:25:53
-	2011 +0200
+Radim Blazek 	2013-04-24
 
-2011-06-07  Marco Hugentobler 
+    vector data provider start/stop editing methods
 
-	* src/app/legend/qgslegend.cpp: Avoid unnecessary canvas refreshes
-	when adding group to legend
+Merge: 608adb8 ac6a1ee
+Alexander Bruy 	2013-04-24
 
-2011-06-07  Marco Hugentobler 
+    Merge branch 'r-stream'
 
-	* src/mapserver/qgswmsserver.cpp: Zoom to filtered layers in wms
-	server if BBOX parameter missing
-
-2011-06-06  Marco Hugentobler 
-
-	* src/core/qgsproject.cpp: Reformating, fix for project cleaning
+Alexander Bruy 	2012-12-01
 
-2011-06-06  Marco Hugentobler 
+    [sextante] add r.stream.* GRASS modules
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp: Fix order of
-	embedded layers in groups
+Alexander Bruy 	2013-04-24
 
-2011-06-06  Marco Hugentobler 
+    [sextante] add separators to context menu
 
-	* src/app/legend/qgslegend.cpp, src/app/qgsembedlayerdialog.cpp,
-	src/core/qgsproject.cpp: More safety checks
+Juergen E. Fischer 	2013-04-24
 
-2011-06-05  Marco Hugentobler 
+    fix #7690
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigcache.cpp, src/mapserver/qgsconfigcache.h,
-	src/mapserver/qgsprojectparser.cpp: Support embedded layers and
-	groups in server
+Chris Crook 	2013-04-24
 
-2011-06-03  Marco Hugentobler 
+    Making test script a bit more robust
 
-	* src/app/qgsembedlayerdialog.cpp, src/ui/qgisapp.ui: Move embed
-	action to layer menu
+Nathan Woodrow 	2013-04-24
 
-2011-06-03  Marco Hugentobler 
+    Add binding for QgsAttributeDialog
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/ui/qgsembedlayerdialogbase.ui: 
-	Improvements to embed dialogs and stability
+Juergen E. Fischer 	2013-04-24
 
-2011-06-01  Marco Hugentobler 
+    german translation update
 
-	* src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp,
-	src/app/legend/qgslegend.h, src/app/qgisapp.cpp,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/core/qgsproject.h,
-	src/ui/qgsembedlayerdialogbase.ui: Wire in dialog to select embedded
-	groups and layers
+Salvatore Larosa 	2013-04-22
 
-2011-05-31  Marco Hugentobler 
+    [pyqgis-console] fixes #7653 and #7646
+    - more minor fixes
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp, src/core/qgsproject.cpp, src/core/qgsproject.h: 
-	Add support for embedded legend groups
+Victor Olaya 	2013-04-17
 
-2011-05-31  Marco Hugentobler 
+    [sextante]new modeler interface
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/core/qgsproject.cpp, src/core/qgsproject.h: Show embedded layers
-	in italic
+Merge: 6d046fc 20d40bf
+Tim Sutton 	2013-04-23
 
-2011-05-31  Marco Hugentobler 
+    Merge pull request #540 from ccrook/delimited_text_bug_fixes
+    
+    More delimited text bug fixes
 
-	* src/app/qgisapp.cpp, src/core/qgsproject.cpp,
-	src/core/qgsproject.h: remove more redundancy in qgsproject
+Chris Crook 	2013-04-24
 
-2011-05-30  Marco Hugentobler 
+    Post merge fixes
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayer.h, src/core/qgsproject.cpp,
-	src/core/qgsproject.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/ui/qgisapp.ui: embedding of
-	single layer
+Merge: 02388fe 1176bbc
+Chris Crook 	2013-04-24
 
-2011-06-07  Marco Hugentobler 
+    Merge with master
 
-	* src/app/legend/qgslegend.cpp: Fix for layer order in case of
-	option addNewLayersToCurrentGroup
+Marco Bernasocchi 	2013-04-16
 
-2011-06-07  Juergen E. Fischer 
+    make cmake honor PYTHON_LIBRARY
 
-	* resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewConnection-es_ES,
-	resources/context_help/QgsNewConnection-fr_FR,
-	resources/context_help/QgsNewConnection-it_IT,
-	resources/context_help/QgsNewConnection-ja_JP,
-	resources/context_help/QgsNewConnection-pl_PL,
-	resources/context_help/QgsNewConnection-pt_BR,
-	resources/context_help/QgsNewConnection-ru_RU,
-	resources/context_help/QgsNewConnection-sk_SK,
-	resources/context_help/QgsNewConnection-sv_SE,
-	resources/context_help/QgsPgNewConnection-de_DE,
-	resources/context_help/QgsPgNewConnection-en_US,
-	resources/context_help/QgsPgNewConnection-es_ES,
-	resources/context_help/QgsPgNewConnection-fr_FR,
-	resources/context_help/QgsPgNewConnection-it_IT,
-	resources/context_help/QgsPgNewConnection-ja_JP,
-	resources/context_help/QgsPgNewConnection-pl_PL,
-	resources/context_help/QgsPgNewConnection-pt_BR,
-	resources/context_help/QgsPgNewConnection-ru_RU,
-	resources/context_help/QgsPgNewConnection-sk_SK,
-	resources/context_help/QgsPgNewConnection-sv_SE,
-	src/providers/postgres/qgspostgresprovider.cpp: document impact of
-	using estimated table metadata (and revert last commit)
+Emilio Loi 	2013-04-23
 
-2011-06-07  Gary Sherman 
+    Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
 
-	* src/providers/postgres/qgspostgresprovider.cpp: Fix feature count
-	for postgres provider so it doesn't use estimated metadata when
-	reporting results of a subset in the query builder
+Merge: 1176bbc 0b780b0
+Jürgen Fischer 	2013-04-23
 
-2011-06-07  Marco Hugentobler 
+    Merge pull request #539 from matthias-kuhn/fix-7639
+    
+    [Fix #7639] Values for new attributes not saved (Blocker)
 
-	* src/app/legend/qgslegend.cpp: Avoid unnecessary canvas refreshes
-	when adding group to legend
+Marco Lechner, in medias res GmbH 	2013-04-22
 
-2011-06-07  Marco Hugentobler 
+    Adds more tolerance to QGIS mapserver for not fully OGC compliant WxS clients
+    
+    At the moment QGIS mapserver is relatively strict in interpreting the REQUEST parameter. With this pull QGIS mapserver also accepts non compliant requests not using CamelCase e.g. REQUEST=getcapabilities. This pull does not brake the servers OGC compliance but makes it more tolerant for non-compliant clients. Even the OGC reference implementation (based on deegree ?) is relatively tolerant at this point.
 
-	* src/mapserver/qgswmsserver.cpp: Zoom to filtered layers in wms
-	server if BBOX parameter missing
+Matthias Kuhn 	2013-04-23
 
-2011-06-06  Marco Hugentobler 
+    [Fix #7674] Transfer ownership of layer to C++ when added to the registry
 
-	* src/core/qgsproject.cpp: Reformating, fix for project cleaning
+Chris Crook 	2013-04-23
 
-2011-06-06  Marco Hugentobler 
+    Updating QGis to QGIS in vector layer source documentation
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp: Fix order of
-	embedded layers in groups
+Merge: 2073f87 f3ab812
+Nathan Woodrow 	2013-04-22
 
-2011-06-06  Marco Hugentobler 
+    Merge pull request #548 from minorua/raster_memory_leaks
+    
+    Fix some memory leaks Fix #6795
 
-	* : commit ba39378bcfcae171ba88412edb2043c78a4f3428 Author: Marco
-	Hugentobler  Date:   Mon Jun 6 14:43:34
-	2011 +0200
+Chris Crook 	2013-04-23
 
-2011-06-06  Tim Sutton 
+    Replace QGis with QGIS throughout
 
-	* : commit 464a94995bf9fa2cb01e217f05511c8d4dcb3504 Author: Sergey
-	Yakushevs  Date:   Mon Jun 6 11:53:27 2011 +0600
+Chris Crook 	2013-04-23
 
-2011-06-05  Marco Hugentobler 
+    Tidying up help file
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigcache.cpp, src/mapserver/qgsconfigcache.h,
-	src/mapserver/qgsprojectparser.cpp: Support embedded layers and
-	groups in server
+Borys Jurgiel 	2013-04-22
 
-2011-06-05  Tim Sutton 
+    Disable encoding combobox in layer properties dialog for OGR provider with OLCStringsAsUTF8==true (so when it doesn't work anyway). Patch from Minoru Akagi.
 
-	* CODING, INSTALL, doc/CODING.t2t, doc/INSTALL.html, doc/index.dox,
-	doc/index.html: Updated references to bug tracker to point to hub
-	website
+Chris Crook 	2013-04-23
 
-2011-06-05  Tim Sutton 
+    Tidying up help file
 
-	* : commit 48d82eb5d9dfa4f25a73cdeedc869bb34659e5c2 Author: Tim
-	Sutton  Date:   Sun Jun 5 13:44:05 2011 +0200
+Salvatore Larosa 	2013-04-22
 
-2011-05-26  NathanW 
+    [pyqgis-console] allows to handle non-ascii chars in script file name
 
-	* src/app/qgslabelinggui.cpp, src/app/qgslabelinggui.h,
-	src/core/qgslabel.cpp, src/core/qgspallabeling.cpp,
-	src/core/qgspallabeling.h, src/core/qgssearchtreenode.cpp,
-	src/core/qgsvectorlayer.cpp, src/gui/CMakeLists.txt,
-	src/gui/qgsexpressionbuilder.cpp, src/gui/qgsexpressionbuilder.h,
-	src/ui/qgsexpressionbuilder.ui, src/ui/qgslabelingguibase.ui: Added
-	expression based labels, simple dialog for entering expressions.
-	Code still needs some clean up and testing.
+Salvatore Larosa 	2013-04-22
 
-2011-06-03  Alexander Bruy 
+    [pyqgis-console] shows also derived class name in object browser widget
 
-	* src/core/qgslabel.h: remove unimplemented
-	QgsLabel::setLabelFieldName()
+Salvatore Larosa 	2013-04-22
 
-2011-06-03  Juergen E. Fischer 
+    [pyqgis-console] fix indentation
 
-	* src/app/qgsmeasuredialog.cpp, src/app/qgsmeasuredialog.h: fix
-	#3866
+Merge: 1a91841 0564ab1
+Borys Jurgiel 	2013-04-22
 
-2011-06-03  Marco Hugentobler 
+    Merge pull request #492 from borysiasty/encoding_write_fix
+    
+    Fix shapefile encoding in QgsVectorFileWriter
 
-	* src/app/qgsembedlayerdialog.cpp, src/ui/qgisapp.ui: Move embed
-	action to layer menu
+Merge: ea382d1 1a91841
+Emilio Loi 	2013-04-22
 
-2011-06-03  Marco Hugentobler 
+    Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
+    
+    Conflicts:
+src/ui/qgsvectorlayerpropertiesbase.ui           
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h: Don't list join fields to
-	facilitate 'save as' function (fixes #3857). Don't display the query
-	builder if a layer has joins (#3858)
+Minoru Akagi 	2013-04-22
 
-2011-06-03  Marco Hugentobler 
+    fix some memory leaks
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/ui/qgsembedlayerdialogbase.ui: 
-	Improvements to embed dialogs and stability
+Salvatore Larosa 	2013-04-22
 
-2011-06-03  Sergey Yakushevs 
+    [pyqgis-console] fix - allows to apply the console settings at all the tabs
 
-	* python/analysis/network/networkanalysis.sip,
-	python/analysis/network/qgsgraphanalyzer.sip,
-	src/analysis/network/qgsgraphanalyzer.cpp,
-	src/analysis/network/qgsgraphanalyzer.h: Python bindings. Part 3
+nyalldawson 	2013-04-22
 
-2011-06-03  Sergey Yakushevs 
+    Add SIP bindings for composer item blend mode and transparency
 
-	* python/analysis/network/qgslinevectorlayerdirector.sip: use
-	QgsVectorLayer*, not use LayerId
+Merge: 269a419 2298cae
+Nyall Dawson 	2013-04-21
 
-2011-06-03  Sergey Yakushevs 
+    Merge pull request #547 from nyalldawson/blend_modes_sip
+    
+    Add sip bindings for layer blend modes
 
-	* src/analysis/network/qgslinevectorlayerdirector.cpp,
-	src/analysis/network/qgslinevectorlayerdirector.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp: use QgsVectorLayer*, not
-	use LayerId
+nyalldawson 	2013-04-22
 
-2011-06-02  Juergen E. Fischer 
+    Add sip bindings for layer blend modes
 
-	* src/browser/qgsbrowser.cpp, src/browser/qgsbrowsermodel.cpp,
-	src/browser/qgsbrowsermodel.h, src/providers/wms/qgswmsprovider.cpp: 
-	browser changes: - use empty string as default wms style - update wms preview when render caching is enabled - some cleanups
+Salvatore Larosa 	2013-04-21
 
-2011-06-02  Steven Mizuno <>
+    [pyqgis-console] converts all newlines to "\n" in order to fix the "Enter selected command" from the editor
+    - fixes background color for toolbar editor on Windows
+    - minor fixes
 
-	* doc/CONTRIBUTORS, resources/context_help/QgsBookmarks-en_US,
-	src/app/qgisapp.cpp, src/app/qgsbookmarkitem.cpp,
-	src/app/qgsbookmarks.cpp, src/app/qgsbookmarks.h: applied #3863
-	(fixes #2774)
+Larry Shaffer 	2013-04-19
 
-2011-06-02  Sergey Yakushevs 
+    Update vector layer properties dialog with vertical tabs
+    
+    - Following subsections still need work: Labeling (ng), Diagrams and possibly more on Style
+    - Add new SVG icons for Labels, Display and Metadata tabs
+    - Add up/down, plus/minus icons for consistency
+    - Move Metadata tab to bottom of list for vector and raster layer property dialogs
+    - Update report stylesheet (metadata output) to support direct RTF copy/paste (i.e. black-colored fonts)
+    - Update report stylesheet to use light gray backgrounds for headers instead of unpredictable highlight color
 
-	* python/analysis/network/networkanalysis.sip,
-	python/analysis/network/qgsgraphdirector.sip,
-	python/analysis/network/qgslinevectorlayerdirector.sip,
-	src/analysis/network/qgsgraphdirector.h: Python bindings. part2
+Werner Macho 	2013-04-21
 
-2011-06-02  Tim Sutton 
+    translation update simplified Chinese by Calvin
 
-	* : Mark icon with 'm' for master branch to make working with
-	multiple installs easier
+Victor Olaya 	2013-04-21
 
-2011-06-02  Tim Sutton 
+    [sextante] fixed problem with algorithm classification in modeler. It was introduced in commit 7feb1af62f
 
-	* : commit 776d7dfbd4962498c5103a7f07e13ae95750c7f8 Author: Sergey
-	Yakushevs  Date:   Thu Jun 2 13:49:43 2011 +0600
+Victor Olaya 	2013-04-21
 
-2011-06-02  Sergey Yakushevs 
+    [sextante] added better autoconfiguration for external apps' paths
 
-	* src/analysis/network/qgsgraphbuilder.h: a code wash
+Victor Olaya 	2013-04-21
 
-2011-06-01  Juergen E. Fischer 
+    [sextante] improvements in configuration dialog
 
-	* src/plugins/grass/qgsgrassedit.cpp,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassplugin.h: fix #3859
+Victor Olaya 	2013-04-21
 
-2011-05-30  Juergen E. Fischer 
+    [sextante]Fixed bug in dissolve tool
 
-	* src/providers/wms/qgswmsprovider.cpp: implement some workaround to
-	support legacy WMS (fixes #3853)
+Victor Olaya 	2013-04-19
 
-2011-06-01  Marco Hugentobler 
+    [sextante] removed headers in example scripts
 
-	* src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp,
-	src/app/legend/qgslegend.h, src/app/qgisapp.cpp,
-	src/app/qgsembedlayerdialog.cpp, src/app/qgsembedlayerdialog.h,
-	src/core/qgsproject.cpp, src/core/qgsproject.h,
-	src/ui/qgsembedlayerdialogbase.ui: Wire in dialog to select embedded
-	groups and layers
+Juergen E. Fischer 	2013-04-21
 
-2011-06-01  Sergey Yakushevs 
+    osgeo4w: update to grass 6.4.3RC3
 
-	* src/analysis/network/CMakeLists.txt,
-	src/analysis/network/qgsarcproperter.h,
-	src/analysis/network/qgsdistancearcproperter.cpp,
-	src/analysis/network/qgsdistancearcproperter.h,
-	src/analysis/network/qgsdistanceedgeproperter.cpp,
-	src/analysis/network/qgsdistanceedgeproperter.h,
-	src/analysis/network/qgsedgeproperter.h,
-	src/analysis/network/qgsgraphdirector.h,
-	src/analysis/network/qgslinevectorlayerdirector.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/speedproperter.h: using only 'vertex/arc'
-	notation
+William Kyngesburye 	2013-04-20
 
-2011-06-01  Sergey Yakushevs 
+    forgot import for default TauDEM/MPI paths for OS X
 
-	* doc/modules.dox, src/analysis/network/qgsedgeproperter.h,
-	src/analysis/network/qgsgraph.h,
-	src/analysis/network/qgsgraphanalyzer.h,
-	src/analysis/network/qgsgraphbuilder.h,
-	src/analysis/network/qgsgraphbuilderintr.h,
-	src/analysis/network/qgsgraphdirector.h,
-	src/analysis/network/qgslinevectorlayerdirector.h: fix Doxygen
-	warnings, documentation update
+Salvatore Larosa 	2013-04-21
 
-2011-05-31  Marco Hugentobler 
+    [pyqgis-console] Follow up 7096a73
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp, src/core/qgsproject.cpp, src/core/qgsproject.h: 
-	Add support for embedded legend groups
+Salvatore Larosa 	2013-04-17
 
-2011-05-31  Sergey Yakushevs 
+    [pyqgis-console] added a python object browser for editor
+    - allow to save state for splitters
+    - minor fixes and cleanup
 
-	* : Merge remote branch 'pb/master' into network-analysis Conflicts: 	src/analysis/network/qgsdistanceedgeproperter.cpp 	src/analysis/network/qgsgraphbuilder.h 	src/plugins/roadgraph/graphbuilder.h 	src/plugins/roadgraph/linevectorlayerdirector.cpp 	src/plugins/roadgraph/roadgraphplugin.cpp 	src/plugins/roadgraph/shortestpathwidget.cpp 	src/plugins/roadgraph/simplegraphbuilder.cpp
+Salvatore Larosa 	2013-04-20
 
-2011-05-31  Marco Hugentobler 
+    [pyqgis-console] remove unnecessary code and fix tabs tooltip
 
-	* src/app/composer/qgscomposerpicturewidget.cpp,
-	src/app/composer/qgscomposerpicturewidget.h: Show composer picture
-	preview icons on demand
+William Kyngesburye 	2013-04-20
 
-2011-05-31  Marco Hugentobler 
+    default TauDEM/MPI paths for OS X
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/core/qgsproject.cpp, src/core/qgsproject.h: Show embedded layers
-	in italic
+Juergen E. Fischer 	2013-04-20
 
-2011-05-31  Marco Hugentobler 
+    fix #7461
 
-	* src/app/qgisapp.cpp, src/core/qgsproject.cpp,
-	src/core/qgsproject.h: remove more redundancy in qgsproject
+Salvatore Larosa 	2013-04-20
 
-2011-05-31  Sergey Yakushevs 
+    [pyqgis-console] disables tab widget editor if restore tabs is prompted and adds tab tooltip
 
-	* src/analysis/network/qgsgraph.cpp,
-	src/analysis/network/qgsgraph.h,
-	src/analysis/network/qgsgraphanalyzer.cpp,
-	src/analysis/network/qgsgraphbuilder.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp: using only
-	'vertex/arc' notation
+Matthias Kuhn 	2013-04-20
 
-2011-05-31  Sergey Yakushevs 
+    Fix doxygen comments
 
-	* src/analysis/network/qgsgraphbuilder.cpp,
-	src/analysis/network/qgsgraphbuilder.h,
-	src/analysis/network/qgsgraphbuilderintr.h,
-	src/analysis/network/qgslinevectorlayerdirector.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp: 1. Use real builder-director pattern.  2. Replase QMap container to QVector, sort and bynary search. RAM
-	saving at the same perfomance.
+Matthias Kuhn 	2013-04-20
 
-2011-05-30  Marco Hugentobler 
+    QgsMapLayerRegistry add/remove signals reworked
+    * "theEmitSignal" parameter renamed to addToLegend
+    * layer(s)WillBeRemoved has no more "theEmitSingal" parameter
+    * layer(s)WillBeRemoved and layer(s)(Was)Added emitted in every case
+    * legendLayersAdded( QList theMapLayers ) signal added
+    * removedAll renamed to removeAll (is emitted BEFORE layers are removed)
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayer.h, src/core/qgsproject.cpp,
-	src/core/qgsproject.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/ui/qgisapp.ui: embedding of
-	single layer
+Juergen E. Fischer 	2013-04-20
 
-2011-05-30  Sergey Yakushevs 
+    windows: include SHA in minidump name
 
-	* src/analysis/network/qgsgraphanalyzer.cpp: fix dijkstra alogorithm
-	return. Shortest three contain wrong edge.
+Juergen E. Fischer 	2013-04-20
 
-2011-05-29  William Kyngesburye 
+    windows: generate minidump on crash
 
-	* CODING, doc/CODING.t2t, doc/INSTALL.html, doc/osx.t2t: sync OS X
-	doc updates and cleanup from release 1.7
+Radim Blazek 	2013-04-20
 
-2011-05-29  William Kyngesburye 
+    python QgsField.__len__() fix; fixes PyQgsMemoryProvider and PyQgsVectorLayer test on platforms with SIP < 4.10.3
 
-	* INSTALL, doc/INSTALL.html, doc/osx.t2t: OS X install updates
+nyalldawson 	2013-04-20
 
-2011-05-28  William Kyngesburye 
+    Make sure margin spin box is always enabled when applicable
 
-	* cmake/FindGDAL.cmake, cmake/FindGEOS.cmake,
-	cmake/MacPlistMacros.cmake: add missing version numbers to Mac
-	framework detection
-
-2011-05-28  Juergen E. Fischer 
-
-	* CMakeLists.txt, src/app/CMakeLists.txt,
-	src/browser/CMakeLists.txt, src/browser/main.cpp,
-	src/helpviewer/CMakeLists.txt: windows: browser and helpviewer are
-	gui applications
-
-2011-05-28  Juergen E. Fischer 
-
-	* ms-windows/osgeo4w/postinstall.bat: osgeo4w: fix postinstall
-
-2011-05-27  Juergen E. Fischer 
-
-	* CMakeLists.txt, cmake/Txt2Tags.cmake, doc/CMakeLists.txt: make pdf
-	generation for txt2tags doc optional
-
-2011-05-27  Juergen E. Fischer 
-
-	* CMakeLists.txt, images/CMakeLists.txt,
-	images/themes/gis/CMakeLists.txt,
-	images/themes/gis/plugins/CMakeLists.txt, python/CMakeLists.txt,
-	python/plugins/CMakeLists.txt,
-	python/plugins/GdalTools/CMakeLists.txt,
-	python/plugins/fTools/CMakeLists.txt,
-	python/plugins/fTools/icons/CMakeLists.txt,
-	resources/CMakeLists.txt, src/CMakeLists.txt,
-	src/mac/CMakeLists.txt, src/mac/Contents/CMakeLists.txt,
-	src/plugins/CMakeLists.txt, src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/themes/CMakeLists.txt,
-	src/providers/CMakeLists.txt,
-	src/providers/sqlanywhere/CMakeLists.txt, tests/CMakeLists.txt,
-	tests/src/CMakeLists.txt: cmake: replace deprecated SUBDIRS with
-	ADD_SUBDIRECTORY
-
-2011-05-27  Juergen E. Fischer 
-
-	* python/plugins/fTools/tools/doValidate.py: implement #3850
-
-2011-05-27  Sergey Yakushevs 
-
-	* src/analysis/network/qgsgraphbuilder.cpp,
-	src/analysis/network/qgslinevectorlayerdirector.cpp: fix excess
-	graph build if topology tolerance > 0
-
-2011-05-27  Tim Sutton 
-
-	* : commit 68490abdfc46d5dbf94be0d1860cbd194d846ae3 Author: Sergey
-	Yakushevs  Date:   Fri May 27 14:26:53 2011 +0600
-
-2011-05-27  Sergey Yakushevs 
-
-	* src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: apply #3849
-
-2011-05-26  Juergen E. Fischer 
-
-	* cmake/Txt2Tags.cmake: create PDFs from t2t files
-
-2011-05-26  Juergen E. Fischer 
-
-	* src/core/qgssearchstringparser.yy: fix grammar warning
-
-2011-05-26  Juergen E. Fischer 
-
-	* src/analysis/vector/qgsgeometryanalyzer.cpp,
-	src/analysis/vector/qgsgeometryanalyzer.h,
-	src/analysis/vector/qgsoverlayanalyzer.cpp,
-	src/analysis/vector/qgsoverlayanalyzer.h,
-	src/app/composer/qgscomposer.h,
-	src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsinformationwidget.h,
-	src/app/gps/qgsgpsmarker.cpp, src/app/gps/qgsgpsmarker.h,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/main.cpp, src/app/ogr/qgsnewogrconnection.cpp,
-	src/app/ogr/qgsnewogrconnection.h,
-	src/app/ogr/qgsogrhelperfunctions.cpp,
-	src/app/ogr/qgsogrhelperfunctions.h,
-	src/app/ogr/qgsogrsublayersdialog.cpp,
-	src/app/ogr/qgsogrsublayersdialog.h,
-	src/app/ogr/qgsopenvectorlayerdialog.cpp,
-	src/app/ogr/qgsopenvectorlayerdialog.h,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.h,
-	src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgnewconnection.h,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/app/qgsabout.cpp,
-	src/app/qgsabout.h, src/app/qgsattributeactiondialog.cpp,
-	src/app/qgsattributeactiondialog.h, src/app/qgsattributedialog.cpp,
-	src/app/qgsattributedialog.h, src/app/qgsattributetypedialog.cpp,
-	src/app/qgsattributetypedialog.h,
-	src/app/qgsattributetypeloaddialog.cpp,
-	src/app/qgsattributetypeloaddialog.h, src/app/qgsbookmarkitem.cpp,
-	src/app/qgsbookmarkitem.h, src/app/qgsbookmarks.cpp,
-	src/app/qgsbookmarks.h, src/app/qgsclipboard.cpp,
-	src/app/qgsclipboard.h, src/app/qgscontinuouscolordialog.cpp,
-	src/app/qgscontinuouscolordialog.h, src/app/qgscustomization.cpp,
-	src/app/qgscustomization.h, src/app/qgsfeatureaction.cpp,
-	src/app/qgsfeatureaction.h, src/app/qgsgraduatedsymboldialog.cpp,
-	src/app/qgsgraduatedsymboldialog.h, src/app/qgshandlebadlayers.cpp,
-	src/app/qgshandlebadlayers.h, src/app/qgshighlight.cpp,
-	src/app/qgshighlight.h, src/app/qgsidentifyresults.cpp,
-	src/app/qgsidentifyresults.h, src/app/qgslabeldialog.cpp,
-	src/app/qgslabeldialog.h, src/app/qgsmaptooladdfeature.cpp,
-	src/app/qgsmaptooladdfeature.h, src/app/qgsmaptooladdpart.cpp,
-	src/app/qgsmaptooladdpart.h, src/app/qgsmaptooladdring.cpp,
-	src/app/qgsmaptooladdring.h, src/app/qgsmaptoolcapture.cpp,
-	src/app/qgsmaptoolcapture.h, src/app/qgsmaptooledit.cpp,
-	src/app/qgsmaptooledit.h, src/app/qgsmaptoolidentify.cpp,
-	src/app/qgsmaptoolidentify.h, src/app/qgsmaptoolmovefeature.cpp,
-	src/app/qgsmaptoolmovefeature.h, src/app/qgsmaptoolreshape.cpp,
-	src/app/qgsmaptoolreshape.h, src/app/qgsmaptoolselect.cpp,
-	src/app/qgsmaptoolselect.h, src/app/qgsmaptoolselectfreehand.cpp,
-	src/app/qgsmaptoolselectfreehand.h,
-	src/app/qgsmaptoolselectpolygon.cpp,
-	src/app/qgsmaptoolselectpolygon.h,
-	src/app/qgsmaptoolselectradius.cpp,
-	src/app/qgsmaptoolselectradius.h,
-	src/app/qgsmaptoolselectrectangle.cpp,
-	src/app/qgsmaptoolselectrectangle.h,
-	src/app/qgsmaptoolselectutils.cpp, src/app/qgsmaptoolselectutils.h,
-	src/app/qgsmaptoolsimplify.h, src/app/qgsmaptoolsplitfeatures.cpp,
-	src/app/qgsmaptoolsplitfeatures.h,
-	src/app/qgsmaptoolvertexedit.cpp, src/app/qgsmaptoolvertexedit.h,
-	src/app/qgsmeasuredialog.cpp, src/app/qgsmeasuretool.cpp,
-	src/app/qgsmeasuretool.h, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/app/qgspastetransformations.cpp,
-	src/app/qgspastetransformations.h, src/app/qgspluginitem.cpp,
-	src/app/qgspluginitem.h, src/app/qgspluginmanager.cpp,
-	src/app/qgspluginmanager.h, src/app/qgspluginmetadata.cpp,
-	src/app/qgspluginmetadata.h, src/app/qgspluginregistry.cpp,
-	src/app/qgspluginregistry.h, src/app/qgsprojectproperties.cpp,
-	src/app/qgsprojectproperties.h, src/app/qgsquerybuilder.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/app/qgssinglesymboldialog.cpp, src/app/qgssinglesymboldialog.h,
-	src/app/qgssponsors.cpp, src/app/qgssponsors.h,
-	src/app/qgstilescalewidget.cpp, src/app/qgstilescalewidget.h,
-	src/app/qgstipgui.cpp, src/app/qgstipgui.h,
-	src/app/qgsuniquevaluedialog.cpp, src/app/qgsuniquevaluedialog.h,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h,
-	src/app/spatialite/qgsnewspatialitelayerdialog.cpp,
-	src/app/spatialite/qgsnewspatialitelayerdialog.h,
-	src/app/spatialite/qgsspatialitesridsdialog.cpp,
-	src/app/spatialite/qgsspatialitesridsdialog.h,
-	src/browser/qgsbrowser.cpp, src/browser/qgsbrowser.h,
-	src/core/composer/qgscomposerpicture.cpp, src/core/qgis.h,
-	src/core/qgsapplication.cpp, src/core/qgsapplication.h,
-	src/core/qgsattributeaction.cpp, src/core/qgsattributeaction.h,
-	src/core/qgsclipper.cpp, src/core/qgsclipper.h,
-	src/core/qgscontexthelp.cpp, src/core/qgscontexthelp.h,
-	src/core/qgscoordinatetransform.cpp,
-	src/core/qgscoordinatetransform.h, src/core/qgscredentials.cpp,
-	src/core/qgscredentials.h, src/core/qgscsexception.h,
-	src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/core/qgsdataprovider.h, src/core/qgsdatasourceuri.cpp,
-	src/core/qgsdatasourceuri.h, src/core/qgsdistancearea.cpp,
-	src/core/qgsdistancearea.h, src/core/qgsexception.h,
-	src/core/qgsfeature.cpp, src/core/qgsfeature.h,
-	src/core/qgsfield.cpp, src/core/qgsfield.h,
-	src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/core/qgshttptransaction.cpp, src/core/qgshttptransaction.h,
-	src/core/qgslabel.cpp, src/core/qgslabel.h,
-	src/core/qgslabelattributes.cpp, src/core/qgslabelattributes.h,
-	src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h,
-	src/core/qgsmaplayerregistry.cpp, src/core/qgsmaplayerregistry.h,
-	src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h,
-	src/core/qgsmaptopixel.cpp, src/core/qgsmaptopixel.h,
-	src/core/qgsmessageoutput.cpp, src/core/qgsmessageoutput.h,
-	src/core/qgsnetworkaccessmanager.cpp,
-	src/core/qgsnetworkaccessmanager.h, src/core/qgspallabeling.cpp,
-	src/core/qgspluginlayerregistry.cpp,
-	src/core/qgspluginlayerregistry.h, src/core/qgspoint.cpp,
-	src/core/qgspoint.h, src/core/qgsproject.cpp,
-	src/core/qgsproject.h, src/core/qgsprojectfiletransform.cpp,
-	src/core/qgsprojectfiletransform.h,
-	src/core/qgsprojectproperty.cpp, src/core/qgsprojectproperty.h,
-	src/core/qgsprovidercountcalcevent.cpp,
-	src/core/qgsprovidercountcalcevent.h,
-	src/core/qgsproviderextentcalcevent.cpp,
-	src/core/qgsproviderextentcalcevent.h,
-	src/core/qgsprovidermetadata.cpp, src/core/qgsprovidermetadata.h,
-	src/core/qgsproviderregistry.cpp, src/core/qgsproviderregistry.h,
-	src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h, src/core/qgsrasterprojector.cpp,
-	src/core/qgsrasterprojector.h, src/core/qgsrectangle.cpp,
-	src/core/qgsrectangle.h, src/core/qgsrunprocess.cpp,
-	src/core/qgsrunprocess.h, src/core/qgsscalecalculator.cpp,
-	src/core/qgsscalecalculator.h, src/core/qgssearchstring.cpp,
-	src/core/qgssearchstring.h, src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h, src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorfilewriter.cpp,
-	src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/raster/qgsrasterbandstats.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrasterviewport.h,
-	src/core/renderer/qgscontinuouscolorrenderer.cpp,
-	src/core/renderer/qgscontinuouscolorrenderer.h,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.h,
-	src/core/renderer/qgsrenderer.h,
-	src/core/renderer/qgssinglesymbolrenderer.cpp,
-	src/core/renderer/qgssinglesymbolrenderer.h,
-	src/core/renderer/qgsuniquevaluerenderer.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.h,
-	src/core/spatialindex/qgsspatialindex.cpp,
-	src/core/spatialindex/qgsspatialindex.h,
-	src/core/symbology/qgssymbol.cpp, src/core/symbology/qgssymbol.h,
-	src/core/symbology/qgssymbologyutils.cpp,
-	src/core/symbology/qgssymbologyutils.h, src/gui/qgisgui.h,
-	src/gui/qgisinterface.cpp, src/gui/qgisinterface.h,
-	src/gui/qgsattributeeditor.cpp, src/gui/qgsattributeeditor.h,
-	src/gui/qgscolorbutton.cpp, src/gui/qgscolorbutton.h,
-	src/gui/qgscomposerview.h, src/gui/qgscredentialdialog.cpp,
-	src/gui/qgscredentialdialog.h, src/gui/qgsdetaileditemdata.cpp,
-	src/gui/qgsdetaileditemdata.h, src/gui/qgsdetaileditemdelegate.cpp,
-	src/gui/qgsdetaileditemdelegate.h,
-	src/gui/qgsdetaileditemwidget.cpp, src/gui/qgsdetaileditemwidget.h,
-	src/gui/qgsfieldvalidator.cpp, src/gui/qgsfieldvalidator.h,
-	src/gui/qgsfiledropedit.cpp, src/gui/qgsfiledropedit.h,
-	src/gui/qgsgenericprojectionselector.cpp,
-	src/gui/qgsgenericprojectionselector.h,
-	src/gui/qgslegendinterface.cpp, src/gui/qgslegendinterface.h,
-	src/gui/qgslonglongvalidator.h, src/gui/qgsludialog.cpp,
-	src/gui/qgsludialog.h, src/gui/qgsmanageconnectionsdialog.cpp,
-	src/gui/qgsmanageconnectionsdialog.h, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapcanvas.h, src/gui/qgsmapcanvasitem.cpp,
-	src/gui/qgsmapcanvasitem.h, src/gui/qgsmapcanvasmap.cpp,
-	src/gui/qgsmapcanvasmap.h, src/gui/qgsmapoverviewcanvas.cpp,
-	src/gui/qgsmapoverviewcanvas.h, src/gui/qgsmaptool.cpp,
-	src/gui/qgsmaptool.h, src/gui/qgsmaptoolemitpoint.cpp,
-	src/gui/qgsmaptoolemitpoint.h, src/gui/qgsmaptoolpan.cpp,
-	src/gui/qgsmaptoolpan.h, src/gui/qgsmaptoolzoom.cpp,
-	src/gui/qgsmaptoolzoom.h, src/gui/qgsmessageviewer.cpp,
-	src/gui/qgsmessageviewer.h, src/gui/qgsnewhttpconnection.cpp,
-	src/gui/qgsnewhttpconnection.h,
-	src/gui/qgsnewvectorlayerdialog.cpp,
-	src/gui/qgsnewvectorlayerdialog.h,
-	src/gui/qgsnumericsortlistviewitem.cpp,
-	src/gui/qgsnumericsortlistviewitem.h,
-	src/gui/qgsprojectionselector.cpp, src/gui/qgsquickprint.cpp,
-	src/gui/qgsquickprint.h, src/gui/qgsrubberband.cpp,
-	src/gui/qgsrubberband.h, src/gui/qgssearchquerybuilder.cpp,
-	src/gui/qgssearchquerybuilder.h, src/gui/qgsvertexmarker.cpp,
-	src/gui/qgsvertexmarker.h,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.h,
-	src/helpviewer/qgshelpserver.cpp, src/helpviewer/qgshelpserver.h,
-	src/helpviewer/qgshelpviewer.cpp, src/helpviewer/qgshelpviewer.h,
-	src/plugins/coordinate_capture/coordinatecapture.cpp,
-	src/plugins/coordinate_capture/coordinatecapture.h,
-	src/plugins/coordinate_capture/coordinatecapturemaptool.cpp,
-	src/plugins/coordinate_capture/coordinatecapturemaptool.h,
-	src/plugins/copyright_label/plugin.cpp,
-	src/plugins/copyright_label/plugin.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/plugins/dxf2shp_converter/dxf2shpconverter.cpp,
-	src/plugins/dxf2shp_converter/dxf2shpconverter.h,
-	src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnection.h,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h,
-	src/plugins/evis/databaseconnection/evisdatabaselayerfieldselection
-	gui.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaselayerfieldselection
-	gui.h, src/plugins/evis/databaseconnection/evisquerydefinition.cpp,
-	src/plugins/evis/databaseconnection/evisquerydefinition.h,
-	src/plugins/evis/eventbrowser/evisconfiguration.cpp,
-	src/plugins/evis/eventbrowser/evisconfiguration.h,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h,
-	src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp,
-	src/plugins/evis/eventbrowser/evisimagedisplaywidget.h,
-	src/plugins/evis/evis.cpp, src/plugins/evis/evis.h,
-	src/plugins/evis/idtool/eviseventidtool.cpp,
-	src/plugins/evis/idtool/eviseventidtool.h,
-	src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.h,
-	src/plugins/georeferencer/qgsgcplist.cpp,
-	src/plugins/georeferencer/qgsgcplist.h,
-	src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistmodel.h,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.h,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.h,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefdelegates.cpp,
-	src/plugins/georeferencer/qgsgeorefdelegates.h,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialog.h,
-	src/plugins/georeferencer/qgsgeorefplugin.cpp,
-	src/plugins/georeferencer/qgsgeorefplugin.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.h,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.h,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h,
-	src/plugins/georeferencer/qgsgeorefvalidators.cpp,
-	src/plugins/georeferencer/qgsgeorefvalidators.h,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsimagewarper.h,
-	src/plugins/georeferencer/qgsleastsquares.cpp,
-	src/plugins/georeferencer/qgsleastsquares.h,
-	src/plugins/georeferencer/qgsmapcoordsdialog.cpp,
-	src/plugins/georeferencer/qgsmapcoordsdialog.h,
-	src/plugins/georeferencer/qgsopenrasterdialog.cpp,
-	src/plugins/georeferencer/qgsopenrasterdialog.h,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgsvalidateddoublespinbox.h,
-	src/plugins/gps_importer/qgsbabelformat.cpp,
-	src/plugins/gps_importer/qgsbabelformat.h,
-	src/plugins/gps_importer/qgsgpsdevice.h,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.h,
-	src/plugins/gps_importer/qgsgpsplugingui.h,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassplugin.h,
-	src/plugins/grass/qtermwidget/konsole_wcwidth.cpp,
-	src/plugins/grass/qtermwidget/konsole_wcwidth.h,
-	src/plugins/north_arrow/plugin.cpp,
-	src/plugins/north_arrow/plugin.h,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp,
-	src/plugins/oracle_raster/qgsoracle_plugin.h,
-	src/plugins/oracle_raster/qgsoracleconnect_ui.cpp,
-	src/plugins/oracle_raster/qgsoracleconnect_ui.h,
-	src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp,
-	src/plugins/oracle_raster/qgsselectgeoraster_ui.h,
-	src/plugins/plugin_template/plugin.cpp,
-	src/plugins/plugin_template/plugin.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/scale_bar/plugin.cpp, src/plugins/scale_bar/plugin.h,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h,
-	src/plugins/spit/qgspgutil.cpp, src/plugins/spit/qgspgutil.h,
-	src/plugins/spit/qgsshapefile.cpp, src/plugins/spit/qgsshapefile.h,
-	src/plugins/spit/qgsspit.cpp, src/plugins/spit/qgsspit.h,
-	src/plugins/spit/qgsspitplugin.cpp,
-	src/plugins/spit/qgsspitplugin.h,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.cpp,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.h,
-	src/plugins/sqlanywhere/sadbtablemodel.cpp,
-	src/plugins/sqlanywhere/sadbtablemodel.h,
-	src/plugins/sqlanywhere/salayer.h,
-	src/plugins/sqlanywhere/sanewconnection.cpp,
-	src/plugins/sqlanywhere/sanewconnection.h,
-	src/plugins/sqlanywhere/saquerybuilder.cpp,
-	src/plugins/sqlanywhere/saquerybuilder.h,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.h,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.h,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/gpx/qgsgpxprovider.cpp,
-	src/providers/grass/qgsgrass.cpp,
-	src/providers/grass/qgsgrassprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/postgres/create_test_tables,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h,
-	src/providers/sqlanywhere/load_alaska_shapes.sql,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.h,
-	src/providers/wms/qgswmsconnection.cpp,
-	src/providers/wms/qgswmsconnection.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h,
-	src/providers/wms/qgswmssourceselect.cpp,
-	src/providers/wms/qgswmssourceselect.h, src/python/qgispython.cpp,
-	src/python/qgspythonutils.h, src/python/qgspythonutilsimpl.cpp,
-	src/python/qgspythonutilsimpl.h, tests/src/core/qgsrenderchecker.h,
-	tools/qgis_config/qgis_config.cpp: remove svn Id tags
-
-2011-05-26  Tim Sutton 
-
-	* : commit ffc267d937efaa0ad2f33dff5effad801c2287e7 Author: Tim
-	Sutton  Date:   Thu May 26 22:30:56 2011 +0200
-
-2011-05-26  Tim Sutton 
-
-	* : Merge pull request #25 from brushtyler/master GdalTools clipper, crop to mask layer extent. will cherry-pick to
-	release branch too.
-
-2011-05-26  Sandro Santilli 
-
-	* src/plugins/grass/qgsgrassedit.cpp,
-	src/plugins/grass/qgsgrassedittools.cpp: Fix missing space between
-	'Middle' and 'Right' click instructions, consistently use 'vertex'
-	rather than 'point' while adding lines or boundaries. Fixes bug
-	#3846.
-
-2011-05-26  Tim Sutton 
-
-	* : commit 0564e47b221c5f9347c5fa3b8564a674adfe72ae Author: Sergey
-	Yakushevs  Date:   Thu May 26 18:23:16 2011 +0600
-
-2011-05-26  Giuseppe Sucameli 
-
-	* python/plugins/GdalTools/tools/doClipper.py: crop to mask layer
-	extent
-
-2011-05-26  Sergey Yakushevs 
-
-	* src/analysis/network/qgsgraphbuilderintr.h,
-	src/analysis/network/qgslinevectorlayerdirector.cpp: fix 'on the
-	fly' transform problem
-
-2011-05-26  Sergey Yakushevs 
-
-	* src/analysis/network/qgsgraphbuilder.cpp,
-	src/analysis/network/qgsgraphbuilder.h,
-	src/analysis/network/qgsgraphbuilderintr.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp: QgsDistanceArea
-	copy-construct is bad. Fix it.
-
-2011-05-25  Radim Blazek 
-
-	* : commit 4070354d5f0a8f401d3cdacac82facc46c3598b9 Author: Radim
-	Blazek  Date:   Wed May 25 20:45:37 2011
-	+0200
-
-2011-05-25  Juergen E. Fischer 
-
-	* ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd: osgeo4w: include browser batch
-	template
-
-2011-05-25  Tim Sutton 
-
-	* : commit 3d7a4cac7e4827defb158780cbbcd9e213bc0210 Author: Sergey
-	Yakushevs  Date:   Wed May 25 16:39:49 2011 +0600
-
-2011-05-25  Juergen E. Fischer 
-
-	* debian/rules: fix fcb001d - affects more distributions than just
-	lenny
-
-2011-05-25  Sergey Yakushevs 
-
-	* src/analysis/network/CMakeLists.txt,
-	src/analysis/network/qgsgraphanalyzer.cpp,
-	src/analysis/network/qgsgraphanalyzer.h: add qgsgraphanalyzer.*
-
-2011-05-25  Juergen E. Fischer 
+Radim Blazek 	2013-04-20
 
-	* debian/rules: fixx lenny build
+    PyQgsDelimitedTextProvider fix for python 2.6 (dictionary comprehensions not supported)
 
-2011-05-24  Sandro Santilli 
+Radim Blazek 	2013-04-20
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Fix wrong arrow
-	orientation when lines end with duplicated points (#3837)
+    raster cleanup
 
-2011-05-24  Juergen E. Fischer 
+Radim Blazek 	2013-04-20
 
-	* debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick,
-	debian/control.natty, debian/control.sid, debian/control.squeeze,
-	debian/python-qgis.lintian-overrides.in,
-	debian/qgis-plugin-grass.lintian-overrides,
-	debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides, debian/rules,
-	i18n/qgis_af.ts, i18n/qgis_ar.ts, i18n/qgis_bg.ts,
-	i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_fa.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts,
-	i18n/qgis_sv.ts, i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts,
-	i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts, qbrowser.1,
-	src/app/qgisapp.cpp, src/app/qgstipfactory.cpp,
-	src/ui/qgsattributetypeedit.ui,
-	src/ui/qgsvectorlayersaveasdialogbase.ui: debian packaging fixes
+    Deleted QgsFreakOutShader
 
-2011-05-24  Marco Hugentobler 
+Nathan Woodrow 	2013-04-20
 
-	* src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsgetrequesthandler.cpp: Discard empty http
-	parameters in mapserver
+    Remove project wording from Project menu
 
-2011-05-24  Tim Sutton 
+Nathan Woodrow 	2013-04-20
 
-	* : commit b7946b4fe45ab5ae274023422fa5f480761785c8 Author: Sergey
-	Yakushevs  Date:   Tue May 24 15:58:01 2011 +0600
+    Change File to Project menu in main screen
 
-2011-05-24  Juergen E. Fischer 
+Radim Blazek 	2013-04-19
 
-	* CMakeLists.txt, src/browser/qgsbrowsermodel.cpp,
-	src/core/qgscredentials.cpp, src/core/qgsdataitem.cpp,
-	src/core/qgsdataitem.h, src/core/qgspallabeling.cpp,
-	src/core/qgssearchstring.cpp, src/core/qgsvectorlayer.cpp,
-	src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassplugin.h,
-	src/plugins/grass/qgsgrassselect.cpp,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/provider.cpp, src/providers/grass/qgsgrass.cpp,
-	src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassprovider.cpp,
-	src/providers/grass/qgsgrassprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/osm/osmprovider.cpp,
-	src/providers/sqlanywhere/CMakeLists.txt,
-	tests/src/analysis/CMakeLists.txt, tests/src/core/CMakeLists.txt,
-	tests/src/gui/CMakeLists.txt: fix windows build by cleaning up
-	(dynamic) linkage and some warnings
+    raster cleanup
 
-2011-05-24  Sergey Yakushevs 
+Radim Blazek 	2013-04-19
 
-	* src/analysis/network/CMakeLists.txt,
-	src/analysis/network/qgsdistanceedgeproperter.cpp,
-	src/analysis/network/qgsdistanceedgeproperter.h,
-	src/analysis/network/qgsedgeproperter.h: add properter classes
+    raster filters moved to pipe node in project file to allow custom filters in future
 
-2011-05-24  Jürgen Fischer 
+Victor Olaya 	2013-04-19
 
-	* : Merge pull request #24 from pcav/master One more typo in IT translation
+    [sextante] removed actions from toolbox, as they can be confusing. The toolbox should contain only algorithms
 
-2011-05-24  Jürgen Fischer 
+Victor Olaya 	2013-04-19
 
-	* : Merge pull request #23 from pcav/master Minor change to IT translation
+    [sextante] Made configuration of algorithm classification available in toolbox
 
-2011-05-24  pcav 
+Marco Hugentobler 	2013-04-19
 
-	* i18n/qgis_it.ts: Minor edit to IT translation
+    Add python bindings for symbology units and data defined functions
 
-2011-05-24  Sergey Yakushevs 
+Marco Hugentobler 	2013-04-19
 
-	* src/analysis/network/qgsedgeproperter.h,
-	src/analysis/network/qgsgraphbuilder.cpp,
-	src/analysis/network/qgsgraphbuilder.h,
-	src/analysis/network/qgsgraphbuilderintr.h: add qgsgraphbuilder
-	interface
+    Use better expression to string conversion
 
-2011-05-24  Sergey Yakushevs 
+Marco Hugentobler 	2013-04-19
 
-	* src/analysis/network/CMakeLists.txt: add qgsgraphbuilder interface
+    Fix offset for ellipse renderer
 
-2011-05-23  Tim Sutton 
+Matthias Kuhn 	2013-04-19
 
-	* : commit b6106203d32fca526445c8153b5367522cf34a6d Author: Juergen
-	E. Fischer  Date:   Mon May 23 18:37:03 2011 +0200
+    [vectorlayercache] properly copy featurerequest
 
-2011-05-23  Juergen E. Fischer 
+Juergen E. Fischer 	2013-04-19
 
-	* debian/changelog, debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.natty, debian/control.sid,
-	debian/control.squeeze, debian/qgis-plugin-grass.postrm,
-	debian/qgis-plugin-grass.preinst, debian/rules,
-	ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd, ms-windows/osgeo4w/postinstall.bat,
-	ms-windows/osgeo4w/preremove.bat: debian and osgeo4w packaging
-	update: include qbrowser
+    fix windows build - add missing CORE_EXPORTs
 
-2011-05-23  Sergey Yakushevs 
+Matthias Kuhn 	2013-04-19
 
-	* src/analysis/network/CMakeLists.txt,
-	src/analysis/network/qgsgraph.cpp, src/analysis/network/qgsgraph.h: 
-	add QgsGraph class
+    [attributetable] No autofallback to FilterMode::ShowVisible
+    As soon as extents of the map canvas changed, the filter showvisible was reapplied without a reason
 
-2011-05-23  Sergey Yakushevs 
+Merge: 31cecdb 7fff92a
+matthias-kuhn 	2013-04-19
 
-	* Doxyfile, src/analysis/CMakeLists.txt: Launch of integration
-	RoadGraph api in the QGIS
+    Merge pull request #544 from rduivenvoorde/rubberband#7628
+    
+    fix #7628
 
-2011-05-23  Tim Sutton 
+Matthias Kuhn 	2013-04-19
 
-	* : commit 4549d0e19934da43ee17fcfb598c3894c5271147 Author: Juergen
-	E. Fischer  Date:   Mon May 23 08:10:35 2011 +0200
+    Fix attributetable and vectorlayercache
+    * In the attributetable there was a mess with references and pointers, originating from 66fadee8ef.
+    * QgsVectorLayerCache did sometimes cache features which did not contain all information which needs to be cached and therefore corrupting the cache and leading to incomplete cache hits.
+    * Add a unit test for the cache problem
+    * Fix QgsCacheIndexFeatureId
+    * QgsAbstractCacheIndex::getCacheIterator now produces a QgsFeatureIterator (instead of a list of Feature Ids). This allows to combine a mixed response, partly satisfied by the cache and partly by an additional query to the backend.
 
-2011-05-23  Sergey Yakushevs 
+D'Hont René-Luc 	2013-04-19
 
-	* : Merge remote branch 'pb/master'
+    qgis wfs server cannot serve geometryless tables
+    
+    http://hub.qgis.org/issues/7534
+    
+    In a project where there are geometryless tables everything seems to allow publish them with qgis wfs server. In the project/layer properties all the proper panels (ex. OWS server) seems to allow this operation, but then when accessing the wfs service with the WFS client, the table is not added correctly in the project. In the TOC shows a strange icon (instead the expected table icon) and the table of attributes is empty.
+    
+    In the client the support for geometryless wfs tables should be available since
+    
+    http://hub.qgis.org/projects/quantum-gis/repository/revisions/aedddc22b11e26df900d1ff91d6d23c94d905c78
+    
+    so it is a server issue.
 
-2011-05-23  Juergen E. Fischer 
+nyalldawson 	2013-04-12
 
-	* src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/providers/wms/qgswmssourceselect.cpp: fix build with Qt 4.6 and
-	some warnings
+    Fix segfault when html composer labels contain img tags
 
-2011-05-21  Juergen E. Fischer 
+nyalldawson 	2013-04-19
 
-	* i18n/qgis_de.ts, src/browser/template.cpp, src/browser/template.h: 
-	german translation update
+    [Fix 7641] Disable margin control for atlas when a point layer is selected
+    Change fixed scale control to radio button
+    Fix margin size not saving
 
-2011-05-23  Tim Sutton 
+nyalldawson 	2013-04-19
 
-	* : commit bb1a4e6af8a20d1752a494198b236a239e65e5ac Merge: 9784cd7
-	cd8ecd6 Author: Tim Sutton  Date:   Sun May 22
-	14:56:42 2011 -0700
+    Fix occasional NaN when automatically calculating heatmap radius
 
-2011-05-22  Tim Sutton 
+PhilippeDorelon 	2013-04-18
 
-	* : commit cd8ecd6a6ea90000867e2a92e53995f6996c5221 Author:
-	Alexander Bruy  Date:   Sun May 22
-	21:12:04 2011 +0300
+    Update qgsvectorlayereditbuffer.cpp
 
-2011-05-22  Radim Blazek 
+Chris Crook 	2013-04-19
 
-	* images/images.qrc, src/browser/qgsbrowser.cpp,
-	src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/plugins/grass/qgsgrassbrowser.cpp,
-	src/plugins/grass/qgsgrassmodel.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassselect.cpp,
-	src/plugins/grass/qgsgrassselect.h,
-	src/plugins/grass/qgsgrassutils.cpp,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassprovider.cpp,
-	src/providers/grass/qgsgrassprovider.h: grass support for qbrowser
+    Minor help file improvements
 
-2011-05-21  Marco Hugentobler 
+Juergen E. Fischer 	2013-04-18
 
-	* src/core/composer/qgscomposermap.cpp,
-	src/gui/qgsannotationitem.cpp, src/gui/qgsmapcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.cpp: Show only annotation
-	items in composermap, no rubberbands etc. Fixes ticket #3774
+    fix #7642
 
-2011-05-21  Juergen E. Fischer 
+Richard Duivenvoorde 	2013-04-18
 
-	* src/browser/qgsbrowsermodel.cpp, src/core/qgsdataitem.cpp,
-	src/core/qgsdataitem.h: fix windows build
+    fix for #7628 undo does not work ok
+    
+    adding a removePoint method, which can also take a negative index to start
+    removing vertices from the end.
+    actual fix for #7628 was to not remove the last node, but the one before that.
 
-2011-05-20  Marco Hugentobler 
+Juergen E. Fischer 	2013-04-18
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fix rotation of
-	simple marker if cache is not used (ticket #3778)
+    german translation update
 
-2011-05-20  Martin Dobias 
+Werner Macho 	2013-04-18
 
-	* : commit 62db3d7dac96fe6cb3bcbded1cebba8381e0fda2 Author: Martin
-	Dobias  Date:   Fri May 20 17:59:06 2011 +0200
+    translation update: bosnian by Almir
 
-2011-05-20  Martin Dobias 
+Werner Macho 	2013-04-18
 
-	* src/core/qgsdataitem.h: Move setCrs() back to QgsDataItem from
-	QgsLayerItem.  The rationale is that some data sources (providers) share CRS for a
-	whole set of layers (e.g. GRASS)
+    translation update: cz by Jan
 
-2011-05-19  Sergey Yakushevs 
+Larry Shaffer 	2013-04-18
 
-	* : Merge remote branch 'pb/master'
+    Update new composer item Rendering group box
+    
+    - Set form layout to match others in composer
+    - Add companion spin box for transparency slider
+    - Add syncGroup property for collapsible group box functionality
+    - Clean up some old commented-out code (replaced by QgsColorButton with alpha support)
 
-2011-05-18  Radim Blazek 
+Larry Shaffer 	2013-04-18
 
-	* src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: QgsLayerItem
-	uri/providerKey/mapLayerType better vithout virtual methods
+    Set better default drop shadow parameters
 
-2011-05-18  Marco Hugentobler 
+Larry Shaffer 	2013-04-18
 
-	* src/providers/wfs/qgswfsdata.cpp: Fix for multipoint bug in wfs
-	provider. Fixes ticket #3829
+    Reduce width of histogram widget to fit better in new raster properties dialog
 
-2011-05-18  Radim Blazek 
+Matthias Kuhn 	2013-04-18
 
-	* src/browser/qgsbrowser.cpp, src/core/qgsdataitem.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: QgsLayerItem::layerInfo replaced
-	by mapLayerType, providerKey and uri methods
+    [FIX #7609] Fetch and cache data for sorting column in one query
 
-2011-05-17  Tim Sutton 
+Larry Shaffer 	2013-04-16
 
-	* : commit 022be6e7a4f6f2a3ffee0ce68bb80814f9b2b9e2 Author: Radim
-	Blazek  Date:   Tue May 17 11:33:43 2011
-	+0200
+    Fix for #7627, wrong label scaling in print or PDF
+    
+    - Add shadow device dpi output (high resolution)
+    - [API] Add scaleToPixelContext method to QgsPalLayerSettings for better precision scaling
 
-2011-05-17  Marco Hugentobler 
+Juergen E. Fischer 	2013-04-18
 
-	* src/app/composer/qgscomposermapwidget.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h: Composermapwidget update
+    wms provider: make smooth pixmap transformation in wmts optional (followup 6604d2f81)
 
-2011-05-16  Martin Dobias 
+Matthias Kuhn 	2013-04-18
 
-	* src/browser/qgsbrowser.cpp, src/browser/qgsbrowsermodel.cpp,
-	src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/providers/wms/qgswmsprovider.cpp: Hide QgsDataItem members: use
-	getters for access
+    [attributetable] Usability improvements for filters
 
-2011-05-16  Martin Dobias 
+Chris Crook 	2013-04-18
 
-	* src/browser/qgsbrowsermodel.cpp, src/core/qgsdataitem.cpp,
-	src/core/qgsdataitem.h, src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: Set data item's parent always in
-	constructor
+    Additional documentation
 
-2011-05-16  Martin Dobias 
+Matthias Kuhn 	2013-04-18
 
-	* src/browser/qgsbrowser.cpp, src/browser/qgsbrowser.h,
-	src/core/qgsdataitem.cpp, src/core/qgsdataitem.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: QgsDataItem refactoring - hasChildren, rowCount, icon methods made non-virtual - shared default icons - data item's mType should be used for differentiating classes - layer-specific virtual methods moved down to QgsLayerItem
+    [Fix #7639] Don't compare TypeName when comparing fields
 
-2011-05-16  mhugent 
+Chris Crook 	2013-04-18
 
-	* : Merge pull request #21 from telwertowski/master Integrate Mac window event code with 'Show composer maps on demand'
+    Error message fixes and more regexp testing
 
-2011-05-16  Radim Blazek 
+Juergen E. Fischer 	2013-04-18
 
-	* dbl.txt, resources/CMakeLists.txt, resources/customization.ini,
-	src/app/qgisapp.cpp: Deblin removed
+    wms provider: add TRANSPARENT parameter when image/x-jpegorpng is choosen (followup 6604d2f814)
 
-2011-05-16  Marco Hugentobler 
+Matthias Kuhn 	2013-04-18
 
-	* src/app/composer/qgscomposer.cpp,
-	src/core/composer/qgscomposermap.cpp: Cleanup
+    [dnd form designer] Expand items by default
 
-2011-05-16  Marco Hugentobler 
+Chris Crook 	2013-04-18
 
-	* python/core/qgscomposeritem.sip, python/core/qgscomposermap.sip,
-	src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h: Show composer maps on demand
-	after project loading
+    Minor change to tooltip message
 
-2011-05-15  Martin Dobias 
+Chris Crook 	2013-04-18
 
-	* src/providers/wms/qgswmssourceselect.cpp: Fix the compilation
+    More testing and bug fixes
+    
+    Regular expression delimiter:  fixed non-intuitive behaviour of not
+    including capture groups in the returned fields, and improved behaviour
+    for anchored regular expressions.  Added test cases for handling of
+    regular expressions.
+    
+    File encoding: Selected file encoding was being ignored.  Fixed and
+    added test cases for file encoding.
+    
+    Bad formatted quoting: Fixed handling of badly formatted quotes (eg
+    unclosed quotes).  Added test case.
+    
+    Field names: Where a file had duplicate or blank field names it was
+    not possible to reliably set the names of X,Y,WKT fields.  Relocated
+    field name handling to simpler common code in QgsDelimitedTextFile, with
+    automatic renaming of fields with ambiguous or missing names.  Add test
+    case for field renaming
+    
+    User interface fixes: Fixed tooltip and other messages throughout.
+    Changed encoding combo box to be alphabetically sorted. Fixed data
+    sample to be refreshed when encoding changed.
 
-2011-05-15  Tim Sutton 
+Salvatore Larosa 	2013-04-18
 
-	* .gitignore, cmake/Txt2Tags.cmake, doc/CODING.t2t,
-	doc/INSTALL.t2t, doc/iauthors.t2t: Added fancy pdf generation from
-	t2t docs
+    [pyqgis-console] fixes the undo action when comment/uncomment out code in editor
 
-2011-05-14  Tim Sutton 
+Juergen E. Fischer 	2013-04-17
 
-	* : commit 27e3a8f6210a1a7ba01c2b5aec718e79651aee4b Author: Tim
-	Sutton  Date:   Sat May 14 11:24:59 2011 +0200
+    show loading layer in status bar
 
-2011-05-14  Tim Sutton 
+nyalldawson 	2013-04-16
 
-	* src/app/composer/qgscomposerlegendwidget.cpp: Fix inconsistent
-	naming of general options
+    Blend modes apply to whole layer, not individual objects (fix #7603)
 
-2011-05-14  Martin Dobias 
+Merge: d3f4e34 4e11972
+Martin Dobias 	2013-04-17
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: Fixed
-	#3818
+    Merge pull request #536 from frugardc/master
+    
+    Fix for  "a class-key must be used when declaring a friend" on make using Oracle Spatial
 
-2011-05-13  Martin Dobias 
+Werner Macho 	2013-04-17
 
-	* : commit 153ad164fefc34555e64d5ec70513f16be6a862b Author: Martin
-	Dobias  Date:   Fri May 13 22:00:46 2011 +0200
+    translation update: bosnian string updates
 
-2011-05-13  Marco Hugentobler 
+Werner Macho 	2013-04-17
 
-	* : commit 55795600db8f76365ebd7b1202467608dd544f18 Author: Marco
-	Hugentobler  Date:   Fri May 13
-	14:51:01 2011 +0200
+    translation update: new language Bosnian
 
-2011-05-13  Marco Hugentobler 
+Chris Crook 	2013-04-18
 
-	* src/mapserver/CMakeLists.txt, src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsconfigcache.h: [FEATURE]: use file watcher in wms
-	server to check for updates in project files
+    Empty records cleaned from layer
 
-2011-05-12  Alexander Bruy 
+Chris Crook 	2013-04-18
 
-	* python/plugins/fTools/tools/doMergeShapes.py,
-	python/plugins/fTools/tools/ftools_utils.py: allow merging
-	shapefiles with different attribute tables (fix #3010)
+    Adding testing feature id to test script
 
-2011-05-12  Sergey Yakushevs 
+Juergen E. Fischer 	2013-04-17
 
-	* : Merge remote branch 'pb/master'
+    fix warnings
 
-2011-05-12  Sergey Yakushevs 
+Merge: cd24f54 e0732a0
+Chris Crook 	2013-04-18
 
-	* : Merge remote branch 'pb/master'
+    Merge branch 'master' into delimited_text_bug_fixes
 
-2011-05-11  Radim Blazek 
+Christian Frugard 	2013-04-17
 
-	* src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h,
-	src/gui/qgsmapcanvasitem.cpp: sync QgsRubberBand and QgsMpaCanvasMap
-	antialiasing, this also fixes 1px QgsRubberBand shift with x11
-	rendering engine if rendered without antialiasing
+    add class key to QgsOracleFeatureIterator
+    
+    fixes "a class-key must be used when declaring a friend" error on compile
 
-2011-05-11  Juergen E. Fischer 
+Juergen E. Fischer 	2013-04-17
 
-	* src/core/qgsvectorfilewriter.cpp: fix #3821
+    fix #7630 - categorized renderer gui produces an empty string category as catch all case, so use it
 
-2011-05-11  Alexander Bruy 
+Matthias Kuhn 	2013-04-17
 
-	* python/plugins/fTools/tools/doMergeShapes.py: Display current
-	filename in progressbar when merging and add option to select
-	encoding for input files
+    [Fix #7552] drag'n'drop form information not loaded from qml file
 
-2011-05-11  Marco Hugentobler 
+Emilio Loi 	2013-04-17
 
-	* src/mapserver/qgscapabilitiescache.cpp,
-	src/mapserver/qgsconfigcache.cpp: Maximum 40 entries in config and
-	capabilities cache
+    Now if style the style already exists on the db it will be updated (Same layer, same style name)
 
-2011-05-11  Marco Hugentobler 
+Emilio Loi 	2013-04-17
 
-	* src/mapserver/qgis_map_serv.cpp: Wire in capabilities cache class
+    Now also "Restore Default Style" works
 
-2011-05-11  Marco Hugentobler 
+Salvatore Larosa 	2013-04-17
 
-	* src/mapserver/CMakeLists.txt, src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsconfigcache.h: Add capabilities cache classes and
-	use QHash for config cache
+    [pyqgis-console] remove duplicate entries
 
-2011-05-11  Marco Hugentobler 
+Emilio Loi 	2013-04-17
 
-	* src/mapserver/qgscapabilitiescache.cpp,
-	src/mapserver/qgscapabilitiescache.h: Add capabilities cache classes
-	and use QHash for config cache
+    Now "Save as Default" button ask where to save the style
 
-2011-05-11  Juergen E. Fischer 
+Victor Olaya 	2013-04-17
 
-	* debian/control, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid: debian fix: git used to be in git-core
+    [sextante] Fixed issue when using non-file based vector layers in modeler
 
-2011-05-11  Marco Hugentobler 
+Victor Olaya 	2013-04-17
 
-	* src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: 
-	Safety check for wms server filters
+    [sextante] fixed problem when exporting non-file based data to be used by 3rd party apps
 
-2011-05-11  Marco Hugentobler 
+Victor Olaya 	2013-04-17
 
-	* : Merge remote-tracking branch 'upstream/master'
+    [sextante] fixed R import bug
 
-2011-05-11  Tim Sutton 
+Victor Olaya 	2013-04-16
 
-	* doc/CONTRIBUTORS, doc/TRANSLATORS: Added Mayeul to the list of
-	contributors (core) and translators (web client)
+    [sextante] Fixed iterative execution
+    
+    Some additional minor fixes
 
-2011-05-10  Juergen E. Fischer 
+Juergen E. Fischer 	2013-04-17
 
-	* i18n/qgis_de.ts: german translation update
+    fix windows build
 
-2011-05-08  Juergen E. Fischer 
+Merge: e6f3b2e 58737b6
+alexbruy 	2013-04-16
 
-	* debian/control, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick,
-	debian/control.natty, debian/control.sid, debian/control.squeeze,
-	ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd, scripts/astyle.sh,
-	scripts/prepare-commit.sh: more svn=>git stuff
+    Merge pull request #526 from vinayan/pip7414
+    
+    [fTools] fix Points in Polygon and Delaunay triangulation (closes #7414, #7360)
 
-2011-05-10  Tim Sutton 
+nyalldawson 	2013-04-17
 
-	* : commit 41bf4c83b368ea0dd716f5a5be4b55dcf7bbb93a Author: Tim
-	Sutton  Date:   Tue May 10 21:55:58 2011 +0200
+    Draw background on painter before rendering map for composer map items (fix #7461)
 
-2011-05-10  Marco Hugentobler 
+Chris Crook 	2013-04-17
 
-	* src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: 
-	Added wms filter support
+    Fixed tooltip text throughout.  Renamced combo box named cbxEncoding to cmbEncoding
 
-2011-05-10  alexbruy 
+Merge: 22e54b9 e1421f5
+Tim Sutton 	2013-04-16
 
-	* : Merge pull request #16 from alexbruy/master mask option for gdal_polygonize tool
+    Merge pull request #532 from ccrook/delimited_text_bug_fixes
+    
+    Three delimited text bug fixes, GUI tidyup, context help fix
 
-2011-05-10  Giuseppe Sucameli 
+Chris Crook 	2013-04-17
 
-	* python/plugins/GdalTools/tools/doContour.py: save file instead of
-	open it in select output file dialog
+    Minor error in tooltip help
 
-2011-05-10  Tim Sutton 
+Merge: c396128 22e54b9
+Chris Crook 	2013-04-17
 
-	* : Merge pull request #14 from pcav/master IT translation wrong
+    Merge branch 'master' into delimited_text_bug_fixes
 
-2011-05-10  Sergey Yakushevs 
+Chris Crook 	2013-04-17
 
-	* src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: Road graph plugin not
-	work or work incorrectly.  Show message "First point not tied" if: 1. 'on the fly' CRS transfomation disabled 2. Source layer CRS not equal project CRS This path fix it.
+    Added label to UI to match context help
 
-2011-05-10  Sergey Yakushevs 
+Chris Crook 	2013-04-17
 
-	* src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: Road graph plugin not
-	work or work incorrectly.  Show message "First point not tied" if: 1. 'on the fly' CRS transfomation disabled 2. Source layer CRS not equal project CRS
+    Fixing layout of examples in delimited text help file
 
-2011-05-10  Werner Macho 
+Chris Crook 	2013-04-17
 
-	* i18n/qgis_mn.ts, i18n/qgis_sl_SI.ts: translation update: mn by
-	Bayarma sl_SI by Joze
+    Second try at renaming delimited text help files
 
-2011-05-10  pcav 
+Chris Crook 	2013-04-17
 
-	* i18n/qgis_it.ts: Minor edits to IT translation
+    Delimited text file: tidying up UI layout and labels, updating help file
 
-2011-05-10  Tim Sutton 
+Merge: 041b9f1 d06ab3c
+Chris Crook 	2013-04-17
 
-	* : Merge pull request #13 from stopa85/master add to .gitignore vim swap file
+    Merge branch 'master' into delimited_text_bug_fixes
 
-2011-05-09  Juergen E. Fischer 
+Chris Crook 	2013-04-17
 
-	* src/app/attributetable/qgsattributetabledialog.cpp: fix #3671:
-	update view after search in attributetable
+    Fixing names of Delimited text context help files
 
-2011-05-08  Tim Sutton 
+Radim Blazek 	2013-04-16
 
-	* : Merge pull request #9 from kyngchaos/master finish fix for #3497
+    raster cleanup
 
-2011-05-07  William Kyngesburye 
+Leyan 	2013-04-16
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp: finish
-	fix for #3497
+    update sip file
 
-2011-05-08  Jürgen E. Fischer 
+Matthias Kuhn 	2013-04-16
 
-	* CMakeLists.txt: fix lenny build
+    Fix feature edit selection in filtered feature list
 
-2011-05-07  Tim Sutton 
+Radim Blazek 	2013-04-16
 
-	* : Merge pull request #6 from timlinux/master Radims fix for raster otf of wms render issues
+    raster cleanup
 
-2011-05-07  Juergen E. Fischer 
+Leyan 	2013-04-16
 
-	* : commit 1bff56ae4cf2e51c3af258b86f763e8a77ce4dd5 Author: Juergen
-	E. Fischer  Date:   Sat May 7 00:48:28
-	2011 +0200
+    call saveAsUserCRS after each call to createFromProj4
 
-2011-05-07  Tim Sutton 
+Matthias Kuhn 	2013-04-16
 
-	* python/plugins/GdalTools/tools/doWarp.py: fix #3800
+    Select proper features in filtered feature list
 
-2011-05-06  Jürgen E. Fischer 
+Leyan 	2013-04-16
 
-	* ms-windows/osgeo4w/postinstall.bat: osgeo4w: fix path in
-	postinstall for crssync
+    custom CRS save API change
 
-2011-05-06  Jürgen E. Fischer 
+Alexander Bruy 	2013-04-16
 
-	* CMakeLists.txt, ms-windows/osgeo4w/package-nightly.cmd,
-	python/core/qgsgeometry.sip, python/utils.py, src/CMakeLists.txt,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetabledialog.h,
-	src/app/qgisapp.cpp, src/app/qgsmaptooladdfeature.cpp,
-	src/core/qgis.cpp, src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgsgeometry.h: some more svn to git migration updates/fixes
+    [sextante] support for non-ASCII characters in SEXTANTE log
 
-2011-05-06  Juergen E. Fischer 
+Emilio Loi 	2013-04-16
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetabledialog.h,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/ui/qgsattributetabledialog.ui: apply #3721: add save edits
-	button to attribute table
+    In QgsVectorLayer::loadNamedStyle changed how to check if the usi refers to db or not
 
-2011-05-06  Juergen E. Fischer 
+Radim Blazek 	2013-04-16
 
-	* images/images.qrc, python/core/qgsvectorlayer.sip,
-	python/gui/qgisinterface.sip, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgisappinterface.cpp, src/app/qgisappinterface.h,
-	src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptooladdfeature.h,
-	src/app/qgsmaptooladdisland.cpp, src/app/qgsmaptooladdisland.h,
-	src/app/qgsmaptooladdpart.cpp, src/app/qgsmaptooladdpart.h,
-	src/app/qgsmaptoolcapture.cpp, src/app/qgsmaptoolcapture.h,
-	src/app/qgsmaptooledit.cpp, src/app/qgsmaptooledit.h,
-	src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/gui/qgisinterface.h, src/ui/qgisapp.ui: apply #3770: allow
-	adding parts to line and point features and some refactoring
+    GDAL provider identify no data fix
 
-2011-05-05  Juergen E. Fischer 
+Marco Hugentobler 	2013-04-16
 
-	* debian/qgis-providers.install,
-	ms-windows/osgeo4w/postinstall.bat,
-	python/core/qgscoordinatereferencesystem.sip, src/CMakeLists.txt,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/crssync/CMakeLists.txt, src/crssync/main.cpp: apply #3645:
-	synchronization of srs.db with GDAL/PROJ on installation
+    More dd symbology cleanups
 
-2011-05-05  Juergen E. Fischer 
+Emilio Loi 	2013-04-16
 
-	* CMakeLists.txt: update version number to 1.8.0 and codename back
-	to Trunk
+    Added controls on style table consistency and named style validity
 
-2011-05-04  Juergen E. Fischer 
+Alexander Bruy 	2013-04-16
 
-	* src/app/qgsattributetypedialog.cpp,
-	src/app/qgsattributetypedialog.h,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/gui/qgsattributeeditor.cpp,
-	src/ui/qgsattributetypeedit.ui: apply #3716: add value relation
-	widget type
+    [sextante] fix Distance Matrix tool
 
-2011-05-04  Juergen E. Fischer 
+Alexander Bruy 	2013-04-14
 
-	* src/app/qgswmssourceselect.cpp,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/ui/qgswmssourceselectbase.ui: apply #3768: tile WMS getmap
-	requests by limiting the size
+    [sextante] add license to script and fix its group
 
-2011-05-04  Juergen E. Fischer 
+Merge: 5875d5a 07abb34
+Salvatore Larosa 	2013-04-15
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsmapserverlogger.cpp: apply #3793: libfcgi cannot
-	change mapserv's environment variables on windows
+    Merge pull request #399 from slarosa/pyqgis_console_side_editor_2
+    
+    [FEATURE] Side Editor for Python Console
 
-2011-05-04  Juergen E. Fischer 
+Salvatore Larosa 	2013-04-16
 
-	* CMakeLists.txt, mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/ReadMe.rtf, python/CMakeLists.txt, python/core/qgis.sip,
-	scripts/prepare-commit.sh, src/app/main.cpp, src/app/qgisapp.cpp,
-	src/core/CMakeLists.txt, src/core/qgis.cpp, src/core/qgis.h,
-	src/python/qgspythonutilsimpl.cpp: update version tracking to git
+    [pyqgis-console] cleaning up code and minor fixes
 
-2011-05-04  Tim Sutton 
+Salvatore Larosa 	2013-04-16
 
-	* : Merge pull request #2 from timlinux/master.  Some minor updates to documentation and added shortname to the
-	quickpackage script
+    [pyqgis-console] fix interrupted system call on run script for osx
 
-2011-05-04  Tim Sutton 
+Salvatore Larosa 	2013-04-15
 
-	* ms-windows/quickpackage.sh: Added shortname option to quickpackage
-	script
+    [pyqgis-console] fix shortcut keysequence for side editor
+    - added class menu removed by mistake
+    - minor fixes
 
-2011-05-04  Tim Sutton 
+Salvatore Larosa 	2013-04-14
 
-	* : Merge pull request #1 from rudilinfiniti/master.  Small install procedure updates for linux from Rudi Thiede
+    [pyqgis-console] added button for comment/uncomment code in side editor and minor fixes
 
-2011-05-02  Tim Sutton 
+Salvatore Larosa 	2013-04-14
 
-	* : commit 645562821987b422fbdd328240156a52c881d145 Author: jef
-	 Date:   Sat Apr 30
-	12:09:19 2011 +0000
+    [pyqgis-console] added new toolbar for side editor
 
-2011-04-30  mhugent 
+Salvatore Larosa 	2013-04-13
 
-	* src/core/qgsmaplayer.cpp: Better fix for restoring custom layer
-	properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15856
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [pyqgis-console] some fix for run script and restore tabs
 
-2011-04-30  telwertowski 
+Salvatore Larosa 	2013-04-13
 
-	* src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp: 
-	Workaround for Mac Cocoa freeze when adding a stop to a gradient
-	color ramp (call QColorDialog::getColor after QInputDialog::getInt
-	instead of before).  git-svn-id: http://svn.osgeo.org/qgis/trunk@15855
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [pyqgis-console] added button to toggle the side editor in python console
 
-2011-04-30  jef 
+Salvatore Larosa 	2013-04-12
 
-	* ms-windows/osgeo4w/qgis.bat.tmpl: fix GRASS support in osgeo4w git-svn-id: http://svn.osgeo.org/qgis/trunk@15854
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [pyqgis-console] fixes prompt save tab on closing
 
-2011-04-30  borysiasty 
+Salvatore Larosa 	2013-01-22
 
-	* i18n/qgis_pl_PL.ts: translation update:pl git-svn-id: http://svn.osgeo.org/qgis/trunk@15853
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Side Editor for Python Console
 
-2011-04-29  borysiasty 
+Chris Crook 	2013-04-16
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15852
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    GUI bug fix - was not restoring delimiter characters from saved settings
 
-2011-04-29  macho 
+Chris Crook 	2013-04-16
 
-	* i18n/qgis_mn.ts: translation updates: mn new coordinator bayarmar
-	enkhtur git-svn-id: http://svn.osgeo.org/qgis/trunk@15850
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Missed committing files
 
-2011-04-29  mhugent 
+Chris Crook 	2013-04-16
 
-	* src/core/qgsmaplayer.cpp: Fix for save and read layer properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15849
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for handling of numeric columns with comma for decimal point (bug #6719)
 
-2011-04-29  jef 
+Larry Shaffer 	2013-04-15
 
-	* src/app/qgsmeasuretool.cpp: fix #3784 git-svn-id: http://svn.osgeo.org/qgis/trunk@15848
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Put old theme icons back into source tree under themes_ or icons_old next to current directories
 
-2011-04-28  jef 
+Larry Shaffer 	2013-04-15
 
-	* src/providers/spatialite/qgsspatialiteprovider.cpp: fix #3782 git-svn-id: http://svn.osgeo.org/qgis/trunk@15847
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Condense app icon themes down to just one, based upon 'gis' theme
+    
+    - 'gis' theme copied over default
+    - All other themes removed, available here:
+      http://drive.dakotacarto.com/qgis/QGIS-images_pre-gis-theme-switch.zip
+    - Make sure new default overrides removed themes
+    - Update some tool buttons for consistency
 
-2011-04-28  rblazek 
+Chris Crook 	2013-04-16
 
-	* src/core/qgsrasterprojector.cpp: fix for epsg 32661 Polar
-	Stereographic git-svn-id: http://svn.osgeo.org/qgis/trunk@15846
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Code name consistency fix and unit tests for functions
 
-2011-04-28  rblazek 
+Chris Crook 	2013-04-16
 
-	* src/core/qgsrasterprojector.cpp: keep row col in limits to avoid
-	crash with 32661; decrease max cp matrix size git-svn-id: http://svn.osgeo.org/qgis/trunk@15845
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixed indentation in qgsexpression.cpp
 
-2011-04-28  jef 
+Chris Crook 	2013-04-16
 
-	* ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd, ms-windows/osgeo4w/qgis.bat.tmpl: 
-	osgeo4w update git-svn-id: http://svn.osgeo.org/qgis/trunk@15844
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Colour functions and en-US help files implemented.
 
-2011-04-28  mhugent 
+Merge: c62c396 268c037
+Chris Crook 	2013-04-16
 
-	* src/core/composer/qgscomposermap.cpp: Fix for placement of map
-	items in composer git-svn-id: http://svn.osgeo.org/qgis/trunk@15843
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into colour_functions
 
-2011-04-28  rblazek 
+Chris Crook 	2013-04-16
 
-	* src/plugins/grass/qgsgrassregion.cpp,
-	src/plugins/grass/qgsgrassregion.h: draw grass region without fill git-svn-id: http://svn.osgeo.org/qgis/trunk@15842
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WIP
 
-2011-04-28  jef 
+Matthias Kuhn 	2013-04-15
 
-	* ms-windows/osgeo4w/package.cmd: oh, well - complete r15835 git-svn-id: http://svn.osgeo.org/qgis/trunk@15841
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Fix #7597] Attribute Table: Reintroduce locale aware sorting
 
-2011-04-28  jef 
+Juergen E. Fischer 	2013-04-15
 
-	* ms-windows/osgeo4w/creatensis.pl,
-	ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/qgis.bat.tmpl: osgeo4w update: adapt to new GRASS
-	6.4.1 and gdal-mrsid packages git-svn-id: http://svn.osgeo.org/qgis/trunk@15840
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix crash on close in attribute table (layer cache already destroyed when model dtor is called)
 
-2011-04-28  rduivenvoorde 
+Marco Hugentobler 	2013-04-15
 
-	* i18n/qgis_nl.ts: another part of dutch grass translation,
-	translated by Carlo van Rijswijk git-svn-id: http://svn.osgeo.org/qgis/trunk@15839
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More symbology cleanups
 
-2011-04-28  mhugent 
+Marco Hugentobler 	2013-04-15
 
-	* python/gui/qgsrubberband.sip, src/gui/qgsmaptoolzoom.cpp,
-	src/gui/qgsmaptoolzoom.h, src/gui/qgsrubberband.cpp,
-	src/gui/qgsrubberband.h: Port zoom rectangle from QRubberBand to
-	QgsRubberBand. Fixes zoom rectangle fill on x11 platform after
-	resize bug workaround git-svn-id: http://svn.osgeo.org/qgis/trunk@15838
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Clean data defined code of svg marker
 
-2011-04-28  macho 
+Radim Blazek 	2013-04-15
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15837
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster cleanup
 
-2011-04-28  borysiasty 
+Matthias Kuhn 	2013-04-15
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15836
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Fix test] Set fixed offset angle for reproducable results
 
-2011-04-27  borysiasty 
+Matthias Kuhn 	2013-04-15
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15835
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Fix diagramtest] replace control image with properly rotated image
 
-2011-04-27  borysiasty 
+vinayan 	2013-04-15
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py: plugin installer:
-	do not consider an empty repo as invalid git-svn-id: http://svn.osgeo.org/qgis/trunk@15832
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Fix #7360] - Fix Dealauney to vector api changes
 
-2011-04-27  timlinux 
+Matthias Kuhn 	2013-04-15
 
-	* src/providers/grass/CMakeLists.txt: Fix windows build issue - moc
-	headers needed for grassprovider too git-svn-id: http://svn.osgeo.org/qgis/trunk@15831
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsVectorLayerCache: include edit buffer changes as well
 
-2011-04-27  jef 
+Matthias Kuhn 	2013-04-15
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15830
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Dual View: Commit feature edits to edit buffer, when the attribute table is closed
+    or when the view mode is changed
+    or when the focus is lost
 
-2011-04-27  macho 
+Radim Blazek 	2013-04-15
 
-	* i18n/qgis_ru.ts,
-	resources/context_help/QgsProjectProperties-ru_RU: translation
-	updates: ru by artem git-svn-id: http://svn.osgeo.org/qgis/trunk@15829
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster properties pipe tab removed
 
-2011-04-26  borysiasty 
+Radim Blazek 	2013-04-15
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15827
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsWebView renamed to QgsIdentifyResultsWebView
 
-2011-04-26  macho 
+Marco Hugentobler 	2013-04-15
 
-	* resources/context_help/QgsNewOgrConnection-fr_FR,
-	resources/context_help/QgsPluginInstallerDialog-fr_FR,
-	resources/context_help/QgsProjectProperties-fr_FR,
-	resources/context_help/SaNewConnection-fr_FR,
-	resources/context_help/SaSourceSelect-fr_FR: translation update:
-	context help fr by JRM git-svn-id: http://svn.osgeo.org/qgis/trunk@15826
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Start cleaning data defined symbology code
 
-2011-04-26  macho 
+Matthias Kuhn 	2013-04-15
 
-	* i18n/qgis_cs_CZ.ts, i18n/qgis_fr.ts, i18n/qgis_hr_HR.ts,
-	i18n/qgis_ja.ts, i18n/qgis_ru.ts, i18n/qgis_sl_SI.ts: translation
-	update: bunch of updates for 1.7 ru by artem, hr_HR by Zoran, fr by
-	JRM, sl_SI by Joze, ja by yoichi, cs_CZ by jan git-svn-id: http://svn.osgeo.org/qgis/trunk@15825
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix javadoc comments
 
-2011-04-26  pcav 
+Matthias Kuhn 	2013-04-13
 
-	* i18n/qgis_it.ts: Updated IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15824
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add updateFields() signal, so adding of joined fields is communicated
+    attributeAdded and attributeDeleted signals are only emitted for "real" fields
+    and not for "virtual fields" as in joined fields. Therefore this signal should
+    be used instead to keep track of these
 
-2011-04-26  jef 
+Juergen E. Fischer 	2013-04-15
 
-	* INSTALL, doc/msvc.t2t, ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd, src/astyle/CMakeLists.txt: rollback
-	r15636, partly r15792 and r15795 git-svn-id: http://svn.osgeo.org/qgis/trunk@15823
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2011-04-26  timlinux 
+Juergen E. Fischer 	2013-04-15
 
-	* .gitignore: More ignore rules git-svn-id: http://svn.osgeo.org/qgis/trunk@15822
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2011-04-24  mhugent 
+Merge: 82b41db 632bfbb
+Tim Sutton 	2013-04-14
 
-	* src/core/qgsclipper.h: Better error handling for polygon clipping git-svn-id: http://svn.osgeo.org/qgis/trunk@15817
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #527 from ccrook/master
+    
+    Fix of delimited text provider to handle CSV files including quoted newlines properly
 
-2011-04-23  mhugent 
+Chris Crook 	2013-04-15
 
-	* src/analysis/raster/qgsrastercalculator.cpp: Use epsg number for
-	output crs in rastercalculator if possible (ticket #3649) git-svn-id: http://svn.osgeo.org/qgis/trunk@15815
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix to detection of LINESTRING WKT in delimited text provider dialog
 
-2011-04-23  esseffe 
+Chris Crook 	2013-04-15
 
-	* src/core/qgsgeometry.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.cpp: fixing several
-	issues related to SpatiaLite 3D Geometries git-svn-id: http://svn.osgeo.org/qgis/trunk@15814
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix to handling of geometry type selectors
 
-2011-04-22  jef 
+Chris Crook 	2013-04-15
 
-	* src/providers/grass/CMakeLists.txt: fix mac build git-svn-id: http://svn.osgeo.org/qgis/trunk@15813
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for degrees/minutes format
 
-2011-04-22  jef 
+Chris Crook 	2013-04-15
 
-	* src/app/qgsmaptoolsplitfeatures.cpp, src/core/qgsgeometry.cpp,
-	src/core/qgsvectorlayer.cpp: fix #2829 git-svn-id: http://svn.osgeo.org/qgis/trunk@15812
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Tidying up test output
 
-2011-04-22  jef 
+Chris Crook 	2013-04-15
 
-	* src/providers/grass/CMakeLists.txt: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@15811
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Items missed in last commit - DMS functionality
 
-2011-04-22  jef 
+Chris Crook 	2013-04-15
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15810
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added DMS functionality, fixed source code indenting
 
-2011-04-22  jef 
+nyalldawson 	2013-04-15
 
-	* src/app/legend/qgslegend.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgscoordinatetransform.cpp, src/core/qgsrectangle.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: improve handling of
-	empty extents (fixes #2997) git-svn-id: http://svn.osgeo.org/qgis/trunk@15809
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Nyall Dawson to authors
 
-2011-04-22  jef 
+Larry Shaffer 	2013-04-05
 
-	* src/providers/gdal/CMakeLists.txt,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgsgrassrasterprovider.h: raster provider:
-	reenable Q_OBJECT and fix comments git-svn-id: http://svn.osgeo.org/qgis/trunk@15808
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add drop shadow option to labels
+    
+    - Add option to show debug rectangles for shadows to PAL engine properties
+    - Add small container class, QgsLabelComponent, for temporal values during generation of label components
+    - Add static image blurring function to QgsSymbolLayerV2Utils
+    - Fix rotational offset issue with label backgrounds
 
-2011-04-22  timlinux 
+Juergen E. Fischer 	2013-04-14
 
-	* ms-windows/osgeo4w/creatensis.pl: Fixed some typos git-svn-id: http://svn.osgeo.org/qgis/trunk@15807
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wms provider: improve cubewerx support
 
-2011-04-22  jef 
+Larry Shaffer 	2013-04-14
 
-	* src/app/qgsquerybuilder.cpp, src/core/qgsvectorlayer.h: fix
-	warning & comment git-svn-id: http://svn.osgeo.org/qgis/trunk@15806
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Followup to 611f77b, better place to trigger gui update
 
-2011-04-22  jef 
+Larry Shaffer 	2013-04-14
 
-	* ms-windows/osgeo4w/creatensis.pl: creatensis.pl: update ecw/mrsid
-	package reference git-svn-id: http://svn.osgeo.org/qgis/trunk@15805
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better fix for situations like #7602
+    
+    - In base class, auto-remove corresponding list widget item when stack widget is removed
+    - Minimize band rendering group box stretching if there probably is no combo box choice (e.g. WMS layer)
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-14
 
-	* src/core/qgsvectorlayer.cpp: ouch, fix debug build on mac II git-svn-id: http://svn.osgeo.org/qgis/trunk@15804
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #7602, Pyramids and Histogram tabs should be hidden for WMS layers in raster properties dialog
 
-2011-04-21  jef 
+Salvatore Larosa 	2013-04-14
 
-	* src/core/qgsvectorlayer.cpp: fix debug build on mac git-svn-id: http://svn.osgeo.org/qgis/trunk@15803
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Salvatore Larosa to authors
 
-2011-04-21  timlinux 
+Emilio Loi 	2013-04-14
 
-	* images/images.qrc: Updates for selection icons in git theme by
-	Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15802
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Loading from db now works. Still missing a lot of controls and info about errors
 
-2011-04-21  timlinux 
+Chris Crook 	2013-04-14
 
-	* images/themes/gis/LICENSE.TXT: Updated license from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15801
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Final tests enabled
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* ms-windows/QGIS-Installer.nsi: missed a file in r15797 git-svn-id: http://svn.osgeo.org/qgis/trunk@15800
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set QgsCollapsibleGroupBox's collapse-on-uncheck to happen only when clicked by user
+    
+    - This keeps checkable group boxes from being programmatically collapsed when initializing a dialog
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* ms-windows/osgeo4w/qgis.bat.tmpl: fix starting qgis_help on
-	windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15799
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #7598, CRS info on the lower right corner does not show anymore
+    
+    - Should not affect fix for #7532
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* src/providers/grass/qgis.g.info.c: fix #3766 git-svn-id: http://svn.osgeo.org/qgis/trunk@15798
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update spacing and expansion of widgets in project properties dialog
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* ms-windows/osgeo4w/creatensis.pl: add options to creatensis.pl git-svn-id: http://svn.osgeo.org/qgis/trunk@15797
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set synGroups for raster properties collapsible group boxes
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* src/app/main.cpp: add runtime warning if loading of translation
-	fails git-svn-id: http://svn.osgeo.org/qgis/trunk@15796
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set Style tab as default on first opening of raster properties
 
-2011-04-21  jef 
+Larry Shaffer 	2013-04-13
 
-	* ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd: windows build without
-	BINDINGS_GLOBAL_INSTALL git-svn-id: http://svn.osgeo.org/qgis/trunk@15795
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix margin addition in QgsOptionsDialogBase
 
-2011-04-21  jef 
+Chris Crook 	2013-04-14
 
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15794
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Tests completed successfully
 
-2011-04-21  timlinux 
+Merge: d124732 d87eb2a
+Chris Crook 	2013-04-14
 
-	* INSTALL, doc/msvc.t2t, ms-windows/plugins.nsh, ms-windows/ui.nsh: 
-	Added a note about not enabling python bindings global install on
-	windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15792
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into delimiter_text_enhancement
 
-2011-04-21  mhugent 
+Merge: 27f65c2 8ef9e6d
+Werner Macho 	2013-04-13
 
-	* src/mapserver/qgswmsserver.cpp: Fix internal function of wms
-	server git-svn-id: http://svn.osgeo.org/qgis/trunk@15791
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #525 from vinayan/fix7474
+    
+    Fix #7474 - Topology checker: QGIS crash on exit, after activating the topology checker panel
 
-2011-04-21  timlinux 
+vinayan 	2013-04-14
 
-	* src/plugins/grass/qgsgrass_plugin.qrc: newgis + dodo = best
-	friends (last removal of the newgis theme) git-svn-id: http://svn.osgeo.org/qgis/trunk@15790
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Fix #7414] - points in polygon does not work
 
-2011-04-21  timlinux 
+Juergen E. Fischer 	2013-04-13
 
-	* images/images.qrc, images/themes/newgis/CMakeLists.txt,
-	images/themes/newgis/LICENSE.TXT: Removed deprecated newgis theme git-svn-id: http://svn.osgeo.org/qgis/trunk@15789
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix doxygen and 'unused' warnings
 
-2011-04-21  timlinux 
+Victor Olaya 	2013-04-13
 
-	* images/themes/gis/mActionChangeLabelProperties.svg,
-	images/themes/gis/mActionLabeling.svg,
-	images/themes/gis/mActionMoveLabel.svg,
-	images/themes/gis/mActionRotateLabel.svg: GIS Theme updates from
-	Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15788
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed issue with header
 
-2011-04-21  mhugent 
+Juergen E. Fischer 	2013-04-13
 
-	* python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/gui/qgslegendinterface.h: Improve python bindings for adding
-	legend groups (#3263). Patch from Marco Bernasocchi git-svn-id: http://svn.osgeo.org/qgis/trunk@15787
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    missed a new file in 7990ec48c
 
-2011-04-20  jef 
+Andreas Neumann 	2013-04-13
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15785
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    replace brush icon for clearing fields with more abstract icon
 
-2011-04-20  jef 
+Radim Blazek 	2013-04-13
 
-	* src/plugins/gps_importer/qgsbabelformat.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp: fix #2227 git-svn-id: http://svn.osgeo.org/qgis/trunk@15784
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    reprojector no data fix
 
-2011-04-20  jef 
+Emilio Loi 	2013-04-13
 
-	* src/core/qgsrasterprojector.cpp: reduce raster reprojection
-	debugging noice git-svn-id: http://svn.osgeo.org/qgis/trunk@15783
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    First attempt to create a load style ui
 
-2011-04-20  macho 
+Matthias Kuhn 	2013-04-13
 
-	* i18n/qgis_af.ts, i18n/qgis_ar.ts, i18n/qgis_bg.ts,
-	i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_fa.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts,
-	i18n/qgis_sv.ts, i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts,
-	i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation update: BIG
-	Stringfreeze for 1.7 second try git-svn-id: http://svn.osgeo.org/qgis/trunk@15782
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Addes Matthias Kuhn to authors
 
-2011-04-20  jef 
+Matthias Kuhn 	2013-04-09
 
-	* src/app/qgsquerybuilder.cpp: fix #3413 git-svn-id: http://svn.osgeo.org/qgis/trunk@15781
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FIX #5525] Attribute table performance for large tables
+    The selection handling performance has been improved a lot
+    Introduces also more detailed signalling of selection change from QgsVectorLayer
 
-2011-04-20  alexbruy 
+vinayan 	2013-04-13
 
-	* python/plugins/fTools/tools/doMergeShapes.py: fix progressbar
-	behaviour in Merge shapefiles tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15777
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix segfault when closing qgis with error rubberbands present in canvas
 
-2011-04-20  jef 
+vinayan 	2013-04-13
 
-	* src/providers/wms/qgswmsprovider.cpp: fix debug build for Qt <4.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@15775
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix segfault on exit after enabling topology dock window
 
-2011-04-20  macho 
+Radim Blazek 	2013-04-13
 
-	* i18n/qgis_pt_BR.ts: translation update: pt_BR by arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@15774
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster no data speed up
 
-2011-04-19  jef 
+Merge: f0132dc 7afa4f6
+Jürgen Fischer 	2013-04-13
 
-	* src/core/qgscoordinatetransform.cpp, src/core/qgsdataprovider.h,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/offline_editing/offline_editing_plugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp: fix crashes on
-	exit (follows up r15751) git-svn-id: http://svn.osgeo.org/qgis/trunk@15773
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #502 from nyalldawson/wms_dialog
+    
+    Fix tab order in WMS dialog, change layer control to extended selection mode for usability
 
-2011-04-19  mhugent 
+Merge: 736f765 f0dd138
+mhugent 	2013-04-13
 
-	* src/gui/qgsmapcanvas.cpp: Fix for resize crash, ticket #2714 git-svn-id: http://svn.osgeo.org/qgis/trunk@15771
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #516 from Oslandia/atlas
+    
+    Fix qgsatlascomposition constructor and related Atlas unit tests
 
-2011-04-19  jef 
+Merge: 99bf5fa e3451bb
+Jürgen Fischer 	2013-04-13
 
-	* src/providers/wms/qgswmsprovider.cpp: re-add wms tile extension
-	workaround git-svn-id: http://svn.osgeo.org/qgis/trunk@15769
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #514 from mbernasocchi/master
+    
+    more qreal vs double issues for android
 
-2011-04-19  mhugent 
+Marco Hugentobler 	2013-04-13
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: Commited
-	patch for #3263 with small modifications git-svn-id: http://svn.osgeo.org/qgis/trunk@15766
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Handle percentage encoded keys in WMS server
 
-2011-04-19  macho 
+Emilio Loi 	2013-04-13
 
-	* i18n/qgis_pt_BR.ts: translation update: pt_BR by Arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@15765
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Now you can add ui files
 
-2011-04-18  jef 
+Victor Olaya 	2013-04-13
 
-	* src/app/qgisapp.cpp: fix #3757 git-svn-id: http://svn.osgeo.org/qgis/trunk@15764
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] force export to shp in grass algorithms, since v.in.ogr syntax seems to be not always the same and some formats (i.e. GML) are not working
 
-2011-04-18  jef 
+Victor Olaya 	2013-04-13
 
-	* src/app/qgisapp.cpp, src/core/raster/qgsrasterlayer.cpp,
-	src/gui/qgsmessageviewer.cpp, src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: improve wms error and progress
-	reporting (fixes #1576) git-svn-id: http://svn.osgeo.org/qgis/trunk@15763
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] minor bug fix in saga/grass installation checking.
+    
+    Also code cleaning
 
-2011-04-18  jef 
+Radim Blazek 	2013-04-13
 
-	* python/core/qgsdataprovider.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/core/qgsdataprovider.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: revert r15747 git-svn-id: http://svn.osgeo.org/qgis/trunk@15762
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster nodata bitmap and reprojector fix; fixes qgis_composerscalebartest
 
-2011-04-18  rblazek 
+Juergen E. Fischer 	2013-04-13
 
-	* src/core/qgsrasterdataprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp: fixed crash when
-	zooming out so that raster map extent is smaller than canvas pixel git-svn-id: http://svn.osgeo.org/qgis/trunk@15760
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7560
 
-2011-04-18  rblazek 
+Victor Olaya 	2013-04-13
 
-	* src/plugins/grass/qgsgrassplugin.cpp: GRASS region another bug fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15759
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] made fields in saga polygon dissolve optional
 
-2011-04-18  rblazek 
+Juergen E. Fischer 	2013-04-13
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassprovider.cpp: GRASS region
-	transformation resent on mapset change git-svn-id: http://svn.osgeo.org/qgis/trunk@15758
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wms provider fixes:
+    - use smooth transformation when rescaling tiles
+    - use ows:BoundingBox to retrieve WMTS extents if no ows:WGS84BoundingBox was
+      given
+    - handle empty WMTS dimensions
 
-2011-04-18  rblazek 
+Marco Hugentobler 	2013-04-13
 
-	* src/plugins/grass/qgsgrassplugin.cpp: GRASS region reprojection
-	fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15757
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix wms server format test
 
-2011-04-18  rblazek 
+Marco Hugentobler 	2013-04-13
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassplugin.h,
-	src/plugins/grass/qgsgrassregion.cpp,
-	src/plugins/grass/qgsgrassregion.h: GRASS region reprojection git-svn-id: http://svn.osgeo.org/qgis/trunk@15756
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve format test
 
-2011-04-18  macho 
+Emilio Loi 	2013-04-13
 
-	* i18n/qgis_el_GR.ts, i18n/qgis_es.ts: translation update: es by
-	carlos and el_GR by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@15755
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added QMenu on loadStyle button with 2 options (load from filesystem, load from db)
 
-2011-04-17  jef 
+Marco Hugentobler 	2013-04-13
 
-	* src/core/qgscoordinatetransform.cpp, src/core/qgsmaprenderer.cpp,
-	src/core/qgsvectorlayer.cpp: fix #2426: dateline split git-svn-id: http://svn.osgeo.org/qgis/trunk@15754
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Support for returning base64 coded results from GetMap and GetPrint
 
-2011-04-17  mhugent 
+Martin Dobias 	2013-04-13
 
-	* src/core/composer/qgscomposerlegend.cpp: Change default setting
-	for layer space in legend git-svn-id: http://svn.osgeo.org/qgis/trunk@15753
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix QgsMessageLog python wrapper
 
-2011-04-17  rblazek 
+Werner Macho 	2013-04-13
 
-	* src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: save timestamp in project file git-svn-id: http://svn.osgeo.org/qgis/trunk@15752
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adding licences for Victor :)
 
-2011-04-17  wonder 
+Juergen E. Fischer 	2013-04-13
 
-	* src/app/main.cpp: Delete QgisApp on destruction in order to get
-	the destructor called (#3531).  Let's hope it will not bring any crashes when qgis exits...  git-svn-id: http://svn.osgeo.org/qgis/trunk@15751
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix 0d69d4c6a
 
-2011-04-17  rblazek 
+Werner Macho 	2013-04-13
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/app/legend/qgslegendlayer.h: legend refresh after data reload git-svn-id: http://svn.osgeo.org/qgis/trunk@15750
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: adding missing strings to be up to date
 
-2011-04-17  rblazek 
+Juergen E. Fischer 	2013-04-13
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h, src/core/qgsdataprovider.h,
-	src/core/qgsrasterdataprovider.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h: completely reload
-	provider if GRASS source data have changed git-svn-id: http://svn.osgeo.org/qgis/trunk@15749
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2011-04-17  jef 
+Emilio Loi 	2013-04-13
 
-	* src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	fix numeric types with precision git-svn-id: http://svn.osgeo.org/qgis/trunk@15748
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Changed "save to db" provider capability check
 
-2011-04-17  jef 
+Juergen E. Fischer 	2013-04-13
 
-	* python/core/qgsdataprovider.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/core/qgsdataprovider.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: fix #7: GetCapabilities no done
-	twice anymore git-svn-id: http://svn.osgeo.org/qgis/trunk@15747
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ignoreShapeEncoding should only have effect on shapes (follows up fea86ea176)
 
-2011-04-17  jef 
+Victor Olaya 	2013-04-13
 
-	* src/app/qgsfieldcalculator.cpp: fix #3750 git-svn-id: http://svn.osgeo.org/qgis/trunk@15746
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] several fixes for supporting optional parameters in modeler
 
-2011-04-17  alexbruy 
+Merge: a6e5569 366e138
+Werner Macho 	2013-04-13
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/ui/qgsrasterlayerpropertiesbase.ui: disable Build Pyramids
-	button if no pyramids levels selected. Also reset progressbar state
-	after building pyramids git-svn-id: http://svn.osgeo.org/qgis/trunk@15745
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #517 from L-Infantini/master
+    
+    Translations and corrections pt_PT
 
-2011-04-17  mhugent 
+Merge: a05ac22 a5436a8
+Werner Macho 	2013-04-13
 
-	* src/mapserver/qgsconfigparser.cpp: Fix missing return statement.
-	Thanks, jef git-svn-id: http://svn.osgeo.org/qgis/trunk@15744
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #524 from tomass/master
+    
+    Update Lithuanian translations
 
-2011-04-17  borysiasty 
+Merge: 5d99595 fe7f26f
+mhugent 	2013-04-13
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@15743
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #523 from 3nids/dropinvalidchars
+    
+    drop invalid chars in project write entry
 
-2011-04-17  mhugent 
+Tomas 	2013-04-13
 
-	* src/core/qgspoint.cpp: higher tolerance for segment snap git-svn-id: http://svn.osgeo.org/qgis/trunk@15742
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update Lithuanian translations
 
-2011-04-17  mhugent 
+Denis Rouzaud 	2013-04-13
 
-	* src/core/qgspoint.cpp: Changed tolerance to make topological
-	editing more reliable (related to ticket #2921) git-svn-id: http://svn.osgeo.org/qgis/trunk@15741
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    drop invalid chars in project write entry
 
-2011-04-17  alexbruy 
+Emilio Loi 	2013-04-13
 
-	* src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp,
-	src/plugins/evis/idtool/eviseventidtool.cpp: fix eVis Event Browser
-	and ID tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15740
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Missing qgssavestyletodbdialog ui files
 
-2011-04-17  alexbruy 
+Chris Crook 	2013-04-13
 
-	* python/plugins/fTools/tools/doGeometry.py: extend default field
-	width in fTools Export/Add Geometry column to fix #3500 git-svn-id: http://svn.osgeo.org/qgis/trunk@15739
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Test development continuing
 
-2011-04-17  wonder 
+Victor Olaya 	2013-04-13
 
-	* src/app/legend/qgslegendlayer.cpp: Show an icon for open attribute
-	table action in legend git-svn-id: http://svn.osgeo.org/qgis/trunk@15738
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] removed pydevd imports added by mistake
 
-2011-04-16  macho 
+Larry Shaffer 	2013-04-12
 
-	* i18n/qgis_pt_BR.ts: translation update: pt_BR by Arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@15737
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update raster properties dialog to vertical tabs
+    
+    - Minimize width of band renderer type widgets by reorganizing layouts and fixing spacing issues
+    - Fix #7569, too much information when edit style on raster layer properties
+    - Group 'Color rendering' options
+    - Add Reset button to 'Color rendering' options
+    - Add icon for pseudocolor colormap sorting
 
-2011-04-16  mhugent 
+Radim Blazek 	2013-04-12
 
-	* src/core/raster/qgsrasterlayer.cpp: Improve raster performance if
-	no clip and stretch is used on multi band color layer git-svn-id: http://svn.osgeo.org/qgis/trunk@15736
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    keep blue value as double, fixes #7107
 
-2011-04-16  rblazek 
+Radim Blazek 	2013-04-12
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h, src/core/qgsdataprovider.h,
-	src/core/qgsrasterdataprovider.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h: raster layer update -
-	first step git-svn-id: http://svn.osgeo.org/qgis/trunk@15735
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    renamed doubleNear to qgsDoubleNear, QgsMalloc to qgsMalloc, QgsCalloc to qgsCalloc, QgsFree to qgsFree
 
-2011-04-16  borysiasty 
+Radim Blazek 	2013-04-12
 
-	* : update epsg:42180 proj string (compatibility version of
-	epsg:2180) git-svn-id: http://svn.osgeo.org/qgis/trunk@15734
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster no data value made optional
 
-2011-04-16  borysiasty 
+Marco Hugentobler 	2013-04-12
 
-	* src/app/qgisapp.cpp: The current CRS not highlighted in the
-	projection selector when called from the layer context menu git-svn-id: http://svn.osgeo.org/qgis/trunk@15732
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Keep item position constant if reference point changes (ticket #7519)
 
-2011-04-16  rblazek 
+Emilio Loi 	2013-04-12
 
-	* src/core/qgsrasterdataprovider.cpp: test if crs are equal git-svn-id: http://svn.osgeo.org/qgis/trunk@15731
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added feature to save vector layers styles to postgis (when provider is postgre$
 
-2011-04-16  jef 
+Emilio Loi 	2013-04-12
 
-	* src/providers/grass/qgsgrass.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@15730
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added feature to save vector layers styles to postgis (when provider is postgres) and load one of them adding a new postgis vector layer
 
-2011-04-16  borysiasty 
+Emilio Loi 	2013-04-12
 
-	* python/console.py: fix #3712 git-svn-id: http://svn.osgeo.org/qgis/trunk@15729
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added new option for saving styles on db for vector layers with postgres provider
 
-2011-04-16  jef 
+Merge: 61b3e4c41 706ac99
+mhugent 	2013-04-12
 
-	* src/core/qgsgeometry.cpp: fix #3439 git-svn-id: http://svn.osgeo.org/qgis/trunk@15728
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #460 from 3nids/readListEntryDefault
+    
+    Added default value argument for readEntryList
 
-2011-04-16  alexbruy 
+Victor Olaya 	2013-04-12
 
-	* src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: more
-	robust fix for #2762 as suggested by Martin git-svn-id: http://svn.osgeo.org/qgis/trunk@15727
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante]changed 'create grid' algorithm to allow non integer values
 
-2011-04-16  jef 
+Victor Olaya 	2013-04-12
 
-	* src/core/qgsmaplayer.cpp, src/core/qgsproject.cpp: fix #3745 git-svn-id: http://svn.osgeo.org/qgis/trunk@15726
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante]improved information when missing 3rd party app before running algorithm
 
-2011-04-16  jef 
+Victor Olaya 	2013-04-12
 
-	* src/app/qgswmssourceselect.cpp: fix wms(-c) usablility issue:
-	switch to tileset tab automatically when tilesets are found.  Some
-	WMS-C server act like WMS servers although they actually aren't.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15725
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] corrected parameter serialization scheme
 
-2011-04-16  mhugent 
+Victor Olaya 	2013-04-12
 
-	* src/mapserver/qgsconfigparser.cpp, src/mapserver/qgswmsserver.cpp: 
-	Raster reprojection in QGIS server git-svn-id: http://svn.osgeo.org/qgis/trunk@15724
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] made ParameterTableField and ParameterString optional.
+    
+    Changed serializing format of ParameterTableField
 
-2011-04-16  jef 
+Marco Hugentobler 	2013-04-12
 
-	* src/app/qgsnewvectorlayerdialog.cpp,
-	src/ui/qgsnewvectorlayerdialogbase.ui: new vector dialog: fix resize
-	and prepopulate with an entry git-svn-id: http://svn.osgeo.org/qgis/trunk@15723
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove debug variable
 
-2011-04-16  jef 
+Marco Hugentobler 	2013-04-12
 
-	* python/plugins/GdalTools/tools/widgetInfo.ui: fix lenny build git-svn-id: http://svn.osgeo.org/qgis/trunk@15722
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Adapt and fix attribute table for new vector api
 
-2011-04-16  alexbruy 
+Juergen E. Fischer 	2013-04-12
 
-	* src/app/legend/qgslegend.cpp: use layer count from
-	QgsMapLayerRegistry instead of QgsMapCanvas. Fixes #2762 git-svn-id: http://svn.osgeo.org/qgis/trunk@15721
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ogr provider: don't ignore set encoding if SHAPE_ENCODING is set although OGR
+    still claims that strings are already UTF-8
 
-2011-04-16  mhugent 
+Merge: 1a4ce3e bc67bde
+mhugent 	2013-04-12
 
-	* python/core/qgscomposeritem.sip,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposermap.cpp: Fix for bug grid annotation
-	distance to map frame (#2899) git-svn-id: http://svn.osgeo.org/qgis/trunk@15720
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #520 from 3nids/removeaction
+    
+    add removeAction method to layer actions
 
-2011-04-16  alexbruy 
+Victor Olaya 	2013-04-12
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: properly
-	clear list of the invalid lines. Also don't display invalid lines
-	message. Addresses #3741 git-svn-id: http://svn.osgeo.org/qgis/trunk@15719
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-04-15  macho 
+    [sextante] fixes in gdal/ogr algorithms and more tests
 
-	* i18n/qgis_es.ts: translation updates: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15718
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-12
 
-2011-04-15  brushtyler 
+    [sextante] fixed missing import
 
-	* src/app/qgsrasterlayerproperties.cpp: fix #2810 git-svn-id: http://svn.osgeo.org/qgis/trunk@15717
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-12
 
-2011-04-15  pcav 
+    [sextante] reintroduced Model->Python conversion
 
-	* i18n/qgis_pt_PT.ts: More pt_PT GUI translation. Thanks Duarte
-	Carreira git-svn-id: http://svn.osgeo.org/qgis/trunk@15715
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-12
 
-2011-04-15  rblazek 
+    [sextante]Fixed issue in algorithms that change projection of output layers
 
-	* src/app/qgisapp.cpp, src/providers/gdal/qgsgdalprovider.cpp: 
-	enable/disable better stretch histogram action git-svn-id: http://svn.osgeo.org/qgis/trunk@15714
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-12
 
-2011-04-15  brushtyler 
+    [sextante] remove TauDEM help files. Now this files are available from
+    SEXTANTE-Help repo
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doBuildVRT.py,
-	python/plugins/GdalTools/tools/doClipper.py,
-	python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doDEM.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/doInfo.py,
-	python/plugins/GdalTools/tools/doMerge.py,
-	python/plugins/GdalTools/tools/doNearBlack.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/doPctRgb.py,
-	python/plugins/GdalTools/tools/doPolygonize.py,
-	python/plugins/GdalTools/tools/doProjection.py,
-	python/plugins/GdalTools/tools/doProximity.py,
-	python/plugins/GdalTools/tools/doRasterize.py,
-	python/plugins/GdalTools/tools/doRgbPct.py,
-	python/plugins/GdalTools/tools/doSieve.py,
-	python/plugins/GdalTools/tools/doTileIndex.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/inOutSelector.py,
-	python/plugins/GdalTools/tools/inOutSelector.ui,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui,
-	python/plugins/GdalTools/tools/widgetClipper.ui,
-	python/plugins/GdalTools/tools/widgetContour.ui,
-	python/plugins/GdalTools/tools/widgetConvert.ui,
-	python/plugins/GdalTools/tools/widgetDEM.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetInfo.ui,
-	python/plugins/GdalTools/tools/widgetMerge.ui,
-	python/plugins/GdalTools/tools/widgetNearBlack.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPluginBase.py,
-	python/plugins/GdalTools/tools/widgetPolygonize.ui,
-	python/plugins/GdalTools/tools/widgetProjection.ui,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetSieve.ui,
-	python/plugins/GdalTools/tools/widgetTileIndex.ui,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: avoid changes of the
-	input layer when layers in canvas changed git-svn-id: http://svn.osgeo.org/qgis/trunk@15713
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-04-15  brushtyler 
+Merge: fa9e0ac ab8b53e
+Tim Sutton 	2013-04-12
 
-	* python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/dialogBase.py,
-	python/plugins/GdalTools/tools/doClipper.py,
-	python/plugins/GdalTools/tools/doMerge.py,
-	python/plugins/GdalTools/tools/widgetClipper.ui: add cutline option
-	to clipper to fix #3066 git-svn-id: http://svn.osgeo.org/qgis/trunk@15712
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #519 from borysiasty/master
+    
+    Update the default symbol set - new symbols from Anita and some fixes
 
-2011-04-15  rblazek 
+jdugge 	2013-04-12
 
-	* src/providers/grass/qgis.g.info.c,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h: keep qgis.g.info
-	process open and get values through stdin/stdout git-svn-id: http://svn.osgeo.org/qgis/trunk@15711
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update widgetRasterize.ui
 
-2011-04-15  jef 
+Denis Rouzaud 	2013-04-12
 
-	* src/app/qgswmssourceselect.cpp: fix wmc-c support broken in r15559 git-svn-id: http://svn.osgeo.org/qgis/trunk@15710
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add removeAction method to layer actions
 
-2011-04-15  brushtyler 
+Chris Crook 	2013-04-12
 
-	* python/plugins/GdalTools/tools/doOverview.py: Fix #3715, don't
-	overwrite source file git-svn-id: http://svn.osgeo.org/qgis/trunk@15709
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Adding code example to QgsVectorLayer documentation
 
-2011-04-15  timlinux 
+Chris Crook 	2013-04-12
 
-	* src/core/CMakeLists.txt: Added missing pyramid.h git-svn-id: http://svn.osgeo.org/qgis/trunk@15708
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    doxygen fixup
 
-2011-04-15  mhugent 
+Borys Jurgiel 	2013-04-12
 
-	* src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsconfigparser.h, src/mapserver/qgsmslayercache.cpp,
-	src/mapserver/qgsmslayercache.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssldparser.h: More flexible limit of layer number in
-	qgis server depending on number of layers in project. Fixes bug
-	#3502 git-svn-id: http://svn.osgeo.org/qgis/trunk@15707
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update default symbol set: more symbols from Anita, lock colour in bottom layer of road symbols, include symbology-ng-style.db instead of the depreciated xml in OsGeo4W
 
-2011-04-15  jef 
+Merge: 920253d a290fa2
+Chris Crook 	2013-04-12
 
-	* src/app/qgsfieldcalculator.cpp: fix #3606 git-svn-id: http://svn.osgeo.org/qgis/trunk@15706
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into delimiter_text_enhancement
 
-2011-04-15  alexbruy 
-
-	* src/core/raster/qgsrasterlayer.cpp: greetings from Maxim and Alex
-	at the QGIS Hackfest in Lisbon. Just fixed (again)bug #3519 git-svn-id: http://svn.osgeo.org/qgis/trunk@15705
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-04-15  rduivenvoorde 
-
-	* i18n/qgis_nl.ts: Dutch translation, thanks Carlo van Rijswijk git-svn-id: http://svn.osgeo.org/qgis/trunk@15704
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-04-15  timlinux 
-
-	* src/core/raster/qgsrasterlayer.cpp: Fix for #3739 - wms
-	transparency not working when set from layer properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15703
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-12
 
-2011-04-15  rblazek 
+    Documentation updates
 
-	* src/providers/gdal/qgsgdalprovider.cpp: gdal slow rendering when
-	zoomed in fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15702
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a290fa2 5432618
+Werner Macho 	2013-04-12
 
-2011-04-15  pcav 
+    Merge pull request #507 from matthias-kuhn/fix-7508
+    
+    [FIX #7508] drag'n'drop form generator wrong creation of group container
 
-	* i18n/qgis_it.ts: IT GUI translation completed - needs final
-	revision git-svn-id: http://svn.osgeo.org/qgis/trunk@15701
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-04-14  mhugent 
+    [FIX #7508] drag'n'drop form generator wrong creation of group container
 
-	* src/core/qgsvectorlayerjoinbuffer.cpp: Fix for bug #3692 (QGIS
-	segfaults after removing table join) git-svn-id: http://svn.osgeo.org/qgis/trunk@15700
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-12
 
-2011-04-14  rblazek 
+    Adding documentation for data providers
 
-	* src/core/raster/qgsrasterlayer.cpp: dpi fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15699
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-04-12
 
-2011-04-13  brushtyler 
+    Tweak margins on attribute table
 
-	* python/plugins/GdalTools/tools/doClipper.py,
-	python/plugins/GdalTools/tools/widgetClipper.ui: fixed #3662 and
-	#3663 git-svn-id: http://svn.osgeo.org/qgis/trunk@15698
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-12
 
-2011-04-13  rblazek 
+    Fix #7549 (selection color is now stored in QgsRendererContext)
 
-	* src/core/qgsrasterprojector.cpp, src/core/qgsrasterprojector.h: 
-	fall to precise reprojection if thresh wasnt reached git-svn-id: http://svn.osgeo.org/qgis/trunk@15697
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-12
 
-2011-04-13  mhugent 
+    WIP
 
-	* src/core/qgsvectorlayer.cpp: Fix for bug #3685, take2 git-svn-id: http://svn.osgeo.org/qgis/trunk@15696
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-11
 
-2011-04-12  mhugent 
+    [API] remove QgsVectorDataProvider::enableGeometrylessFeatures(bool)
+    
+    Geometryless features are not skipped by default anymore.
 
-	* src/mapserver/qgsprojectparser.cpp: Use filename for title of WMS
-	top layer if project title empty (ticket #3719) git-svn-id: http://svn.osgeo.org/qgis/trunk@15695
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-04-11
 
-2011-04-12  jef 
+    fix error when labeling joinfields with spatialite files
+    
+    Manually applied the patch from PhilippeDorelo
+    this should fix bug #7068
 
-	* src/core/qgsvectorfilewriter.cpp: fix #3720 git-svn-id: http://svn.osgeo.org/qgis/trunk@15694
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 207da36 6d60215
+Werner Macho 	2013-04-11
 
-2011-04-11  mhugent 
+    Merge pull request #518 from PhilippeDorelon/valuerelation
+    
+    Fix issue #7561 : valueMap or valueRelation not visible in attributeTable
 
-	* src/analysis/vector/qgszonalstatistics.cpp: Return error code in
-	zonal statistics if operation canceled by user git-svn-id: http://svn.osgeo.org/qgis/trunk@15693
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-11
 
-2011-04-11  mhugent 
+    [sextante]changed how grass help files are found.
+    
+    Now there's no need to set the help folder, it will look for html pages online instead
 
-	* src/app/qgsmaptoollabel.cpp, src/app/qgsmaptoolmovelabel.cpp,
-	src/core/qgslabelsearchtree.cpp, src/core/qgslabelsearchtree.h,
-	src/core/qgspallabeling.cpp: Fix label and diagram editing if otf
-	reprojection is enabled (ticket #3685) git-svn-id: http://svn.osgeo.org/qgis/trunk@15692
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-11
 
-2011-04-10  jef 
+    [sextante] removed saga help files, since they are rather useless
 
-	* src/app/qgsattributetypedialog.cpp,
-	src/app/qgsattributetypedialog.h,
-	src/app/qgsattributetypeloaddialog.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/core/qgsvectorlayer.cpp: 
-	cleanup and fix attribute widget configuration git-svn-id: http://svn.osgeo.org/qgis/trunk@15691
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+PhilippeDorelon 	2013-04-11
 
-2011-04-09  jef 
+    Update qgsattributetablemodel.cpp
 
-	* src/core/qgis.cpp: fix geometry descriptions list git-svn-id: http://svn.osgeo.org/qgis/trunk@15690
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-09  macho 
+    [sextante] catch IO error when user tried to save file in system
+    directory (fix #7259)
 
-	* doc/TRANSLATORS, i18n/qgis_af.ts,
-	resources/context_help/QgsNewConnection-fr_FR,
-	resources/context_help/QgsNewSpatialiteLayerDialog-fr_FR,
-	resources/context_help/QgsNorthArrowPluginGui-fr_FR,
-	resources/context_help/QgsOpenVectorLayerDialog-fr_FR,
-	resources/context_help/QgsOptions-fr_FR,
-	resources/context_help/QgsPgSourceSelect-fr_FR,
-	resources/context_help/QgsScaleBarPluginGui-fr_FR,
-	resources/context_help/QgsSpatiaLiteSourceSelect-fr_FR,
-	resources/context_help/RgSettingsDlg-fr_FR,
-	resources/context_help/RgShortestPathWidget-fr_FR: translation
-	update: af by Hendrik and FR Context Help by JRM git-svn-id: http://svn.osgeo.org/qgis/trunk@15689
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Orion 	2013-04-11
 
-2011-04-09  wonder 
+    Translations and correctios
 
-	* images/images.qrc,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: Symbol props
-	dialog: Locked/unlocked icons instead of just showing locked icon.
-	This should allow users easily identify the current state.  Default icons from Nuvola icon set, gis/newgis icons from Robert.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15688
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-09  jef 
+    fix Merge shapefiles tool in fTools (fix #7570)
 
-	* src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h: fix #3057 git-svn-id: http://svn.osgeo.org/qgis/trunk@15687
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-09  jef 
+    [sextante] attempt to fix issue with non-ASCII characters in modeler
 
-	* src/app/qgisapp.cpp: fix restore of initial extent of startup
-	project git-svn-id: http://svn.osgeo.org/qgis/trunk@15686
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-09  wonder 
+    [sextante] remove generated *.py files from ui directory
 
-	* src/app/qgisapp.cpp: Place project properties action in File menu
-	correctly (Gnome/Mac) git-svn-id: http://svn.osgeo.org/qgis/trunk@15685
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-09  timlinux 
+    [sextante] allow to run models with no parameters (partially reverts
+    4e5c660823)
 
-	* doc/index.html: Updated index.html for release git-svn-id: http://svn.osgeo.org/qgis/trunk@15684
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-08  mhugent 
+    [sextante] also improve Fields Calculator (field type, length and
+    precision settings)
 
-	* src/app/qgsmaptoolmovelabel.cpp: Fix for jumps if moving diagrams
-	and labels with rotation point other than lower left git-svn-id: http://svn.osgeo.org/qgis/trunk@15683
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2013-04-11
 
-2011-04-08  wonder 
+    Fix qgsatlascomposition constructor and related Atlas unit tests
 
-	* src/app/attributetable/qgsattributetableview.cpp: Show actions
-	only if there are no actions? (Catch 22 strikes again!) git-svn-id: http://svn.osgeo.org/qgis/trunk@15682
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-11
 
-2011-04-08  jef 
+    [sextante] adding missing files from tools reorganization
 
-	* src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h: fix
-	wms source select: - allow selection of named layers - allow individual selection of all layers of a group to allow layer
-	order management - show upcoming layer name unless one is manually given git-svn-id: http://svn.osgeo.org/qgis/trunk@15681
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-11
 
-2011-04-07  macho 
+    [sextante] add mechanism to allow easily piping grass console output to text file
 
-	* i18n/qgis_bg.ts, i18n/qgis_fr.ts: translation update: fr by JRM
-	and bg by Zahari git-svn-id: http://svn.osgeo.org/qgis/trunk@15680
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-11
 
-2011-04-07  macho 
+    [sextante]Fixed bug in pyculator algorithm
 
-	* i18n/qgis_lv.ts, i18n/qgis_tr.ts: translation update: lv by maris
-	and tr by Osman git-svn-id: http://svn.osgeo.org/qgis/trunk@15679
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-10
 
-2011-04-07  pcav 
+    [sextante] reorganized sextante tools and how they are exposed and added some tests
 
-	* i18n/qgis_it.ts, src/plugins/grass/modules-6.3/default.qgc,
-	src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-common/v.build.one.qgm: More IT
-	translation, one more GRASS module (thanks Markus Neteler) git-svn-id: http://svn.osgeo.org/qgis/trunk@15678
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4b06df0 254fc4d
+Werner Macho 	2013-04-11
 
-2011-04-06  macho 
+    Merge pull request #515 from 3nids/duplicatecode
+    
+    remove duplicate code
 
-	* i18n/qgis_pt_BR.ts: translation update: pt_BR by Arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@15677
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Denis Rouzaud 	2013-04-11
 
-2011-04-05  alexbruy 
+    remove duplicate code
 
-	* src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp: 
-	synchronize eVis with latest changes in delimited text provider (fix
-	#3701) git-svn-id: http://svn.osgeo.org/qgis/trunk@15676
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-05  wonder 
+    [sextante] fix Advaced Python Calculator, add ability to select field
+    type, lenght and precision
 
-	* python/console.py: python console: another fix for pasting git-svn-id: http://svn.osgeo.org/qgis/trunk@15675
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-11
 
-2011-04-05  pcav 
+    [sextante] add missed import
 
-	* src/plugins/grass/modules-common/v.in.ogr.qgis.qgm: Minor fix to a
-	GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@15674
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-10
 
-2011-04-05  macho 
+    fix doxygen warnings
 
-	* i18n/qgis_af.ts: translation update: af by Hendrik git-svn-id: http://svn.osgeo.org/qgis/trunk@15673
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-04-10
 
-2011-04-04  mhugent 
+    Update recent symbology widget update for cross-platform consistency
+    
+    Also:
+    - Keep color wells from over expanding
+    - Group color wells together, where appropriate
+    - Make SVG Groups view wider (was too thin)
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Fix for scaling of
-	rotated svg pattern. Ticket #3700 git-svn-id: http://svn.osgeo.org/qgis/trunk@15672
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-10
 
-2011-04-04  macho 
+    QgsRasterBlock::Range to QgsRasterRange
 
-	* i18n/qgis_af.ts: translation update: introduce new language
-	afrikaans on request git-svn-id: http://svn.osgeo.org/qgis/trunk@15671
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-10
 
-2011-04-04  esseffe 
+    GRASS direct no data for type
 
-	* src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h: supporting
-	SpatiaLite's 3D Geometries git-svn-id: http://svn.osgeo.org/qgis/trunk@15670
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-10
 
-2011-04-04  jef 
+    gdal set output no data fix
 
-	* INSTALL, doc/linux.t2t, scripts/scandeps.pl: update debian build
-	dependencies in INSTALL git-svn-id: http://svn.osgeo.org/qgis/trunk@15668
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-04  jef 
+    [sextante] don't run models without algorithms and/or parameters
 
-	* src/core/qgsrasterprojector.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15667
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-03  macho 
+    [sextante] allow set field length and precision in Add field algorithm
 
-	* i18n/qgis_es.ts, i18n/qgis_hu.ts, i18n/qgis_sl_SI.ts: translation
-	updates: sl_SI by Joze, es by Carlos, hu by Zoltan git-svn-id: http://svn.osgeo.org/qgis/trunk@15666
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-03  alexbruy 
+    [sextante] allow non-ASCII characters in string parameters
 
-	* src/gui/qgisinterface.h: add docstring for previous commit git-svn-id: http://svn.osgeo.org/qgis/trunk@15665
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-03  alexbruy 
+    [sextante] increase max and min limits for numeric values (fixes #7143
+    and possible similar issues)
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h: make Raster
-	toolbar accessible from Python git-svn-id: http://svn.osgeo.org/qgis/trunk@15664
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-02  wonder 
+    [sextante] fix parameters handling in some GDAL algorithms
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h: Shortcuts for easier creation
-	of symbology-ng symbols git-svn-id: http://svn.osgeo.org/qgis/trunk@15663
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-10
 
-2011-04-02  macho 
+    [sextante] escape filenames, passed to GDAL tools (fix #5923)
 
-	* i18n/qgis_es.ts: translation update: es by Carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15662
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 212aea7 f7732d3
+Nathan Woodrow 	2013-04-10
 
-2011-04-01  pcav 
+    Merge pull request #511 from nyalldawson/html_labels_fix
+    
+    Fix html labels rendering before they are fully loaded...
 
-	* i18n/qgis_it.ts: IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15661
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 76f8d60 212aea7
+Marco Bernasocchi 	2013-04-10
 
-2011-04-01  pcav 
+    Merge remote-tracking branch 'upstream/master'
 
-	* i18n/qgis_it.ts: IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15660
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Bernasocchi 	2013-04-10
 
-2011-04-01  timlinux 
+    more qreal vs double issues for android
 
-	* src/core/qgsvectorlayer.h: Minor comments cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@15659
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-10
 
-2011-04-01  timlinux 
+    Change point displacement renderer to work with new vector api
 
-	* cmake/FindGRASS.cmake: And another place to look for grass and
-	enjoy the true elixr of happiness git-svn-id: http://svn.osgeo.org/qgis/trunk@15658
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 8c714a9 d52d4da
+Nathan Woodrow 	2013-04-09
 
-2011-04-01  timlinux 
+    Merge pull request #513 from olivierdalang/SymbolLayerWidgetsUISmallUpdate
+    
+    small update of the UI of the symbollayers widgets
 
-	* cmake/FindGRASS.cmake: Added lib64 to grass search path git-svn-id: http://svn.osgeo.org/qgis/trunk@15657
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-09
 
-2011-04-01  stopa85 
+    [sextante] more tests
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h: fix: #3688 git-svn-id: http://svn.osgeo.org/qgis/trunk@15656
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-09
 
-2011-03-31  timlinux 
+    [sextante] moved SilentProgress to independent module
 
-	* doc/msvc.t2t: Added a little more detail on the final packaging
-	step git-svn-id: http://svn.osgeo.org/qgis/trunk@15655
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-09
 
-2011-03-31  timlinux 
+    GML parser boundedBy fix
 
-	* INSTALL: Added a little more detail on the final packaging step git-svn-id: http://svn.osgeo.org/qgis/trunk@15654
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1436056 dbf795e
+mhugent 	2013-04-09
 
-2011-03-31  rblazek 
+    Merge pull request #512 from nyalldawson/blend_mode_fixes
+    
+    Some blending fixes and code cleanup
 
-	* src/providers/wms/qgswmsprovider.cpp: setAuthorization for
-	GetFeatureInfo git-svn-id: http://svn.osgeo.org/qgis/trunk@15653
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-09
 
-2011-03-31  mhugent 
+    Fix html labels rendering before they are fully loaded. Prevents missing images in html labels when composer layout is output for the first time.
 
-	* src/core/qgspallabeling.cpp: Fix for disappearing small labels in
-	printout git-svn-id: http://svn.osgeo.org/qgis/trunk@15652
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-09
 
-2011-03-31  rduivenvoorde 
+    After astyle
 
-	* i18n/qgis_nl.ts: tranlsation update nl git-svn-id: http://svn.osgeo.org/qgis/trunk@15651
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-04-09
 
-2011-03-31  rduivenvoorde 
+    small update of the UI of the symbollayers widgets
 
-	* i18n/qgis_nl.ts: new parts of translation by Raymond Nijssen git-svn-id: http://svn.osgeo.org/qgis/trunk@15650
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-09
 
-2011-03-31  rblazek 
+    Pre astyle
 
-	* src/app/legend/qgslegend.cpp: zoom to best scale with reprojection git-svn-id: http://svn.osgeo.org/qgis/trunk@15649
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Pirmin Kalberer 	2013-04-08
 
-2011-03-31  rblazek 
+    Globe: Fix compilation with osgearth 2.4
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/providers/grass/qgsgrass.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp: more crs debug git-svn-id: http://svn.osgeo.org/qgis/trunk@15648
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-07
 
-2011-03-31  stopa85 
+    Fix labels not updating for atlas prints when blend mode is applied
 
-	* src/app/qgsmaptoolidentify.cpp: fix #3689 git-svn-id: http://svn.osgeo.org/qgis/trunk@15647
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-06
 
-2011-03-31  rblazek 
+    Use QPainter::CompositionMode for all internal blending variables and functions
 
-	* src/core/qgsrasterprojector.cpp, src/core/qgsrasterprojector.h: 
-	avoid fragile pointer git-svn-id: http://svn.osgeo.org/qgis/trunk@15646
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-08
 
-2011-03-30  mhugent 
+    german translation update
 
-	* src/gui/qgssearchquerybuilder.cpp: Use vector layer methods to
-	test queries (instead of provider methods) git-svn-id: http://svn.osgeo.org/qgis/trunk@15645
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2013-04-09
 
-2011-03-30  jef 
+    Delimited text fix compiling
 
-	* ms-windows/QGIS-Installer.nsi: fix nsis installer git-svn-id: http://svn.osgeo.org/qgis/trunk@15643
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-08
 
-2011-03-30  timlinux 
+    also remove transparency tests
 
-	* ms-windows/QGIS-Installer.nsi, ms-windows/quickpackage.sh: nsi
-	updates: commented out reboot which causes nsis to fail for me.
-	Updated quickpackage to set version name to 1.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@15642
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-08
 
-2011-03-30  timlinux 
+    remove unused layer transparency (and fix some warnings)
 
-	* doc/msvc.t2t: Added note about fixing path to flex and bison git-svn-id: http://svn.osgeo.org/qgis/trunk@15641
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a150865 57c2307
+Jürgen Fischer 	2013-04-08
 
-2011-03-30  timlinux 
+    Merge pull request #508 from matthias-kuhn/dual-view-fixes
+    
+    Dual view fixes
 
-	* INSTALL: Added note about path for flex and bison git-svn-id: http://svn.osgeo.org/qgis/trunk@15640
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4306632 a21fc5a
+Jürgen Fischer 	2013-04-08
 
-2011-03-29  macho 
+    Merge pull request #510 from matthias-kuhn/field-calculator-perf
+    
+    [FIX #7533] Field calculator is slow
 
-	* i18n/qgis_hr_HR.ts: translation update: hr_HR by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@15638
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-29  mhugent 
+    [FIX #7533] Field calculator is slow
+    Set the QgsDistanceArea only once and not for every loop cycle.
+    QgsCoordinateReferenceSystem::loadFromDb takes very long.
 
-	* src/core/pal/feature.cpp: Applied modification from strk to fix
-	label direction, ticket #3643 git-svn-id: http://svn.osgeo.org/qgis/trunk@15637
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-08
 
-2011-03-29  jef 
+    Fix #7542 (crash in vector layer properties for geometryless layers)
 
-	* src/astyle/CMakeLists.txt: don't build astyle in source directory git-svn-id: http://svn.osgeo.org/qgis/trunk@15636
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-08
 
-2011-03-29  jef 
+    PyQgsRasterLayer identify test fixed
 
-	* src/core/qgsprojectversion.h: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@15635
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-08
 
-2011-03-28  borysiasty 
+    Added QgsRasterIdentifyResult
 
-	* i18n/qgis_pl_PL.ts: ts update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15634
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  jef 
+    [FIX #7543] Dual View Table/Form: Preview column not saved in project
 
-	* python/core/core.sip, python/core/qgsprojectversion.sip: add
-	bindings to QgsProjectVersion git-svn-id: http://svn.osgeo.org/qgis/trunk@15633
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 34adbe7 52da723
+Werner Macho 	2013-04-08
 
-2011-03-28  macho 
+    Merge pull request #505 from vinayan/7477-add-rule-crash
+    
+     [FIX #7477] Topology Checker - Crash as soon a layer is choosen when defining a rule
 
-	* i18n/qgis_ja.ts,
-	resources/context_help/QgsAttributeTableDialog-fr_FR,
-	resources/context_help/QgsBookmarks-fr_FR,
-	resources/context_help/QgsCopyrightLabelPluginGui-fr_FR,
-	resources/context_help/QgsDelimitedTextPluginGui-fr_FR,
-	resources/context_help/QgsFieldCalculator-fr_FR,
-	resources/context_help/QgsMeasureDialog-fr_FR: translation update:
-	ja by Yoichi context_help translations fr by JRM git-svn-id: http://svn.osgeo.org/qgis/trunk@15631
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  timlinux 
+    [FIX #7530] Attribute table: Edited feature not updated in single row
+    If only a single row was shown, the outdated cached feature would be shown even
+    when the attribute behind it was edited.
 
-	* INSTALL, doc/msvc.t2t: Dont use my personal username in docs git-svn-id: http://svn.osgeo.org/qgis/trunk@15628
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  timlinux 
+    [FIX #7529] Attribute table: Crash when changing column filter
+    When using the field calculator and afterwards changing the column filter
+    resulted in a crash
 
-	* INSTALL: Added a few lines about using git in win build git-svn-id: http://svn.osgeo.org/qgis/trunk@15627
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  timlinux 
+    Attribute editor, form view: Change selection behavior
+    Text background is now used for the current edit selection
+    The icon shows the feature selection state
 
-	* doc/msvc.t2t: Added a few lines about using git in win build git-svn-id: http://svn.osgeo.org/qgis/trunk@15626
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  kyngchaos 
+    Attribute table selection: performance improvements
+    When selecting features with the mouse (click and drag) only redraw
+    the map canvas, once the mouse is released.
 
-	* src/mac/Contents/CMakeLists.txt: handle DESTDIR git-svn-id: http://svn.osgeo.org/qgis/trunk@15625
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-08
 
-2011-03-28  borysiasty 
+    Properly show feature count in attribute table title
+    Total # of features
+    Filtered features
+    Selected features
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15624
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-08
 
-2011-03-27  kyngchaos 
+    qgis_bench json log fix; QGIS2 settings
 
-	* INSTALL, doc/osx.t2t: mac install update git-svn-id: http://svn.osgeo.org/qgis/trunk@15623
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-08
 
-2011-03-27  jef 
+    Fixed PyQgsVectorLayer test
 
-	* i18n/qgis_de.ts: minor german translation fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15622
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-07
 
-2011-03-27  macho 
+    [API] Removed QgsSymbol, QgsMarkerCatalgoue and QgsSymbologyUtils
 
-	* i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_fr.ts,
-	i18n/qgis_is.ts: translation update: is by Thordur fr by JRM el_GR
-	by Mike cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@15621
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-07
 
-2011-03-27  wonder 
+    [API] Removed old symbology's QgsRenderer
 
-	* src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Fixed #3681 git-svn-id: http://svn.osgeo.org/qgis/trunk@15620
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-07
 
-2011-03-27  wonder 
+    [API] Removed old symbology QgsRenderer implementations
 
-	* python/core/qgsmaprenderer.sip: PyQGIS: added new destination CRS
-	methods, deprecated old ones.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15619
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-07
 
-2011-03-27  jef 
+    [API] Removed old renderer support from QgsVectorLayer
 
-	* debian/changelog, debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.natty,
-	debian/control.squeeze, debian/rules: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15618
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-04-06
 
-2011-03-27  jef 
+    Removed old symbology dialogs.
 
-	* : sync srs.db with current trunk of proj git-svn-id: http://svn.osgeo.org/qgis/trunk@15617
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-23
 
-2011-03-27  jef 
+    Removed QgsQuickPrint class
 
-	* src/core/qgis.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: man, 2
-	commits - 2 missed files git-svn-id: http://svn.osgeo.org/qgis/trunk@15616
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-04-07
 
-2011-03-27  jef 
+    translation update: galician by Xan
 
-	* src/app/qgsvectorlayerproperties.cpp: fix enabling of field edit
-	buttons in vector properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15615
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-07
 
-2011-03-27  jef 
+    update .qgis to .qgis2 (to be updated on release and some more utf8 fixes
+    (fixes #7537)
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: fix
-	#3682 git-svn-id: http://svn.osgeo.org/qgis/trunk@15614
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-07
 
-2011-03-27  wonder 
+    spatialite isn't optional anymore (offlineediting, osm):
+    - remove configuration options
 
-	* src/core/qgsapplication.cpp: Avoid duplicate SVG paths git-svn-id: http://svn.osgeo.org/qgis/trunk@15613
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-07
 
-2011-03-27  timlinux 
+    fix #6640
 
-	* doc/index.html: Added header for 1.7 release in index.html git-svn-id: http://svn.osgeo.org/qgis/trunk@15612
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-07
 
-2011-03-26  borysiasty 
+    deduce plugin directory from a plugin that actually still exists
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15611
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-04-07
 
-2011-03-26  jef 
+    Fix #7532, startup forces new project document, even when opening data file
 
-	* python/plugins/fTools/tools/doGeometry.py: fix #3661 git-svn-id: http://svn.osgeo.org/qgis/trunk@15610
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-07
 
-2011-03-26  borysiasty 
+    cleanup Qwt build for OS X
 
-	* src/ui/symbollayer/widget_simplemarker.ui,
-	src/ui/symbollayer/widget_svgmarker.ui: ng-symbology dialogs fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15609
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-07
 
-2011-03-26  kyngchaos 
+    fix autodetect of saga & otb on OS X, also detect bundled grass, saga & otb
 
-	* mac/cmake/1qt.cmake.in: fix empty build type bug git-svn-id: http://svn.osgeo.org/qgis/trunk@15608
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Minoru Akagi 	2013-04-07
 
-2011-03-26  macho 
+    fix #4303
 
-	* i18n/qgis_ru.ts: translation update: ru by Artem git-svn-id: http://svn.osgeo.org/qgis/trunk@15607
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2bfffaa 73c74ac
+Werner Macho 	2013-04-07
 
-2011-03-25  mhugent 
+    Merge pull request #506 from vinayan/fixdupes
+    
+    [FIX #7473] Topology checker-must not have duplicates does not work
 
-	* src/core/qgsmaprenderer.cpp, src/core/qgsrendercontext.cpp: Apply
-	patch for #2230 by sunilkcube git-svn-id: http://svn.osgeo.org/qgis/trunk@15606
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-06
 
-2011-03-25  wonder 
+    [sextante]fix for calling SAGA under OSX
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fix simple
-	marker transparency (#3658) git-svn-id: http://svn.osgeo.org/qgis/trunk@15605
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-06
 
-2011-03-25  mhugent 
+    [sextante] fixed #7525 (problem with checking if external app is installed)
 
-	* src/core/composer/qgscomposerlegend.cpp: Follow up for #3605 git-svn-id: http://svn.osgeo.org/qgis/trunk@15604
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-06
 
-2011-03-25  wonder 
+    adjustments to build on cygwin
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Fixed scaling of
-	simple line offset (#3479) git-svn-id: http://svn.osgeo.org/qgis/trunk@15603
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-06
 
-2011-03-25  wonder 
+    apply #7521
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Draw a polyline
-	only if it is empty? (Catch 22 strikes back) git-svn-id: http://svn.osgeo.org/qgis/trunk@15602
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+vinayan 	2013-04-06
 
-2011-03-25  wonder 
+    [FIX #7473] Topology checker-must not have duplicates does not work
 
-	* python/core/qgsvectorlayer.sip: Default value for limit git-svn-id: http://svn.osgeo.org/qgis/trunk@15601
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+vinayan 	2013-04-06
 
-2011-03-25  macho 
+    rename ui members
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts,
-	i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts,
-	i18n/qgis_sv.ts, i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts,
-	i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts,
-	python/plugins/GdalTools/tools/widgetDEM.ui,
-	src/ui/qgsvectorlayerpropertiesbase.ui: translation update: 2 typos
-	in english original..  git-svn-id: http://svn.osgeo.org/qgis/trunk@15600
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+vinayan 	2013-04-06
 
-2011-03-25  wonder 
+    fix crash as soon a layer is choosen when defining a rule
 
-	* src/ui/qgsoptionsbase.ui: Remove a legacy tooltip git-svn-id: http://svn.osgeo.org/qgis/trunk@15599
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-06
 
-2011-03-25  mhugent 
+    establish that Qwt 6.1 is not currently supported with internal QwtPolar (closes #7495)
 
-	* src/analysis/vector/qgszonalstatistics.cpp: Fix for zonal
-	statistics: continue if attributes are already there git-svn-id: http://svn.osgeo.org/qgis/trunk@15598
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-06
 
-2011-03-25  macho 
+    qgis_bench revision log
 
-	* i18n/qgis_es.ts: translation update: es by Carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15597
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-06
 
-2011-03-25  jef 
+    also use expat include directory in core
 
-	* src/providers/postgres/qgspostgresprovider.cpp: update postgis
-	capabilities detection git-svn-id: http://svn.osgeo.org/qgis/trunk@15596
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-05
 
-2011-03-25  macho 
+    remove debug statement
 
-	* i18n/qgis_ru.ts: translation update: .ru by Artem git-svn-id: http://svn.osgeo.org/qgis/trunk@15595
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 217e7c1 9ffc8ee
+Larry Shaffer 	2013-04-05
 
-2011-03-25  borysiasty 
+    Merge pull request #504 from nyalldawson/blend_modes
+    
+    Fix dialog resetting label and label buffer blend modes
 
-	* src/gui/qgslegendinterface.h: patch #3263 from mbernasocchi git-svn-id: http://svn.osgeo.org/qgis/trunk@15594
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-05
 
-2011-03-24  macho 
+    don't show ticks on slider
 
-	* i18n/qgis_hr_HR.ts: translation update: hr_HR by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@15593
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-05
 
-2011-03-24  pcav 
+    display and allow editing of simplify tolerance value (fix #7515)
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15592
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-05
 
-2011-03-24  mhugent 
+    Fix dialog resetting label and label buffer blend modes
 
-	* src/core/pal/feature.cpp: Fix for ticket #3643, direction symbol
-	of label git-svn-id: http://svn.osgeo.org/qgis/trunk@15591
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-04
 
-2011-03-24  timlinux 
+    qgis_bench wall clock time
 
-	* scripts/update-srs-db.php: Removed this as its redundant with
-	patch from Juergen at #3645 git-svn-id: http://svn.osgeo.org/qgis/trunk@15590
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: b809723 5e1dfd9
+Nathan Woodrow 	2013-04-04
 
-2011-03-24  timlinux 
+    Merge pull request #503 from nyalldawson/heatmap_dialog
+    
+    Fix tab order in heatmap dialog
 
-	* scripts/update-srs-db.php: Added utility script from Mathieu
-	Pellerin for updating the srs.db from gdal git-svn-id: http://svn.osgeo.org/qgis/trunk@15589
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-28
 
-2011-03-23  wonder 
+    [FEATURE] Add background shapes and svg symbols to labels
+    
+    - Rectangle, square, circle and ellipse generated symbols
+    - SVG background via new symbology, so uses cache
+    - Add new gui class QgsSvgSelectorWidget, symbol selector setup culled from symbologyV2
+    - Does not include any associated data defined mappings, yet
+    - Does not auto-search for missing SVGs, yet
+    - Caveat: does not currently account for background size in PAL collision calculations (overlaps occur)
+    - Allow direct update of QgsColorButton background
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp: Fixed a crash
-	(clicking zoom to layer with no active layer) git-svn-id: http://svn.osgeo.org/qgis/trunk@15588
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-04-05
 
-2011-03-23  timlinux 
+    Fix tab order in heatmap dialog
 
-	* : Improvements to splash - reduce capitation levels git-svn-id: http://svn.osgeo.org/qgis/trunk@15587
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-04
 
-2011-03-23  jef 
+    bundle osgEarthQt if available
 
-	* src/gui/qgsprojectionselector.cpp: fix #3674 git-svn-id: http://svn.osgeo.org/qgis/trunk@15586
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-04
 
-2011-03-23  wonder 
+    missed a file in 052dab819
 
-	* python/console.py: Python console: do not run the last line of the
-	pasted code.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15585
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-04
 
-2011-03-23  jef 
+    fix #7503
 
-	* : sync srs.db with PROJ 4.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@15584
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-04
 
-2011-03-23  rduivenvoorde 
+    fix ftools union
 
-	* i18n/qgis_nl.ts: dutch translation percentage going up ...  git-svn-id: http://svn.osgeo.org/qgis/trunk@15583
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-04
 
-2011-03-23  brushtyler 
+    Add xml encoding to wms capabilities
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/CMakeLists.txt,
-	python/plugins/GdalTools/tools/doDEM.py,
-	python/plugins/GdalTools/tools/terrain.txt: Added the default color
-	configuration file for DEM tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15582
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-04
 
-2011-03-23  mhugent 
+    Outline width for simple marker
 
-	* src/analysis/raster/qgsrastercalculator.cpp: Write projection info
-	to raster calculator output git-svn-id: http://svn.osgeo.org/qgis/trunk@15581
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-04
 
-2011-03-23  timlinux 
+    fix typo Python test for QgsVectorLayer
 
-	* : Update splash for wroclaw git-svn-id: http://svn.osgeo.org/qgis/trunk@15580
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1c6ee9f 45cd49d
+mhugent 	2013-04-04
 
-2011-03-23  borysiasty 
+    Merge pull request #500 from matthias-kuhn/rendering-cache-crash
+    
+    [Bugfix] Make rendering cache more stable
 
-	* src/gui/qgssearchquerybuilder.h: connect solitary help button git-svn-id: http://svn.osgeo.org/qgis/trunk@15579
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: d7a6bc3 8e7ffd7
+Chris Crook 	2013-04-04
 
-2011-03-23  macho 
+    Merged with dev master
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sr_CS-Latn.ts,
-	i18n/qgis_sv.ts, i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts,
-	i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation update: String
-	Freeze - preparing for 1.7 release git-svn-id: http://svn.osgeo.org/qgis/trunk@15578
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: cbd257d 3a4aa8f
+alexbruy 	2013-04-04
 
-2011-03-23  brushtyler 
+    Merge pull request #501 from nyalldawson/color_control
+    
+    Fix contrast, grayscale and colorize settings not applying to exported raster layers
 
-	* python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doPolygonize.py,
-	python/plugins/GdalTools/tools/doTileIndex.py: fix error when output
-	file is not created git-svn-id: http://svn.osgeo.org/qgis/trunk@15577
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-04-04
 
-2011-03-23  jef 
+    fix typo in SEXTANTE test
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15576
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-04-04
 
-2011-03-23  jef 
+    Fix tab order in WMS dialog, change layer control to extended selection mode for usability
 
-	* python/gui/qgsattributeeditor.sip,
-	python/gui/qgsfieldvalidator.sip,
-	python/gui/qgslegendinterface.sip, src/gui/qgsattributeeditor.cpp,
-	src/gui/qgsattributeeditor.h: fix build error git-svn-id: http://svn.osgeo.org/qgis/trunk@15575
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-04
 
-2011-03-23  borysiasty 
+    fix #7499
 
-	* src/app/qgisapp.cpp: unicode string tr git-svn-id: http://svn.osgeo.org/qgis/trunk@15574
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-04-04
 
-2011-03-23  jef 
+    Fix contrast, grayscale and colorize settings not applying to exported raster layers
 
-	* CMakeLists.txt, i18n/qgis_de.ts: fix release name git-svn-id: http://svn.osgeo.org/qgis/trunk@15573
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-03
 
-2011-03-23  jef 
+    Avoid possible crash in rendering loop
+    As soon as QgsMapLayer::setCacheImage is called while rendering is active, a crash occurs.
+    Due to the fact, that processEvents is called from the main rendering loop, such situations cannot always be foreseen.
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15572
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-03
 
-2011-03-23  borysiasty 
+    consider user no data values in GDAL raster statistics and histogram, fixes partialy #3840
 
-	* python/gui/qgsattributeeditor.sip: typo fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15571
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-03
 
-2011-03-22  macho 
+    also decode Qt colors
 
-	* resources/context_help/QgsFieldCalculator-en_US: take out non
-	working functions in the help file. Will be moved to QgsQueryBuilder
-	help git-svn-id: http://svn.osgeo.org/qgis/trunk@15570
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-04-03
 
-2011-03-22  borysiasty 
+    composer legend - default symbol to label space fix
 
-	* CMakeLists.txt, src/app/qgisapp.cpp: fix the release name git-svn-id: http://svn.osgeo.org/qgis/trunk@15569
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: cf4fd4a 1de8c76
+Jürgen Fischer 	2013-04-03
 
-2011-03-22  jef 
+    Merge pull request #498 from matthias-kuhn/feature-request-no-geom
+    
+    [FIX] Show attribute table for layers without geometry
 
-	* src/app/legend/qgslegendlayer.cpp, src/app/qgisapp.cpp,
-	src/app/qgstipfactory.cpp,
-	src/gui/qgsprojectbadlayerguihandler.cpp,
-	src/gui/qgsprojectbadlayerguihandler.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp: automatic
-	indentation update (r15302-r15567) git-svn-id: http://svn.osgeo.org/qgis/trunk@15568
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 80f7b5a 378a858
+alexbruy 	2013-04-03
 
-2011-03-22  timlinux 
+    Merge pull request #499 from nyalldawson/fix_alpha
+    
+    Fixes loss of alpha after adjusting brightness/contrast/hue/saturation for rasters
 
-	* CMakeLists.txt, src/app/qgisapp.cpp: Updated 'whats new' for
-	string freeze. Updated version name to Wroclaw.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15567
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-03
 
-2011-03-22  jef 
+    Fix loss of alpha when adjusting brightness/hue/saturation for raster. Clean and optimize code
 
-	* python/gui/gui.sip, python/gui/qgsattributeeditor.sip,
-	python/gui/qgsfieldvalidator.sip, src/gui/CMakeLists.txt,
-	src/gui/qgsattributeeditor.cpp, src/gui/qgsfieldvalidator.cpp,
-	src/gui/qgsfieldvalidator.h: fix #2554: - apply heavy modified patch from sunil.  - introduces QgsFieldValidator including sip bindings - add missing sip bindings to QgsAttributeEditor git-svn-id: http://svn.osgeo.org/qgis/trunk@15566
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-03
 
-2011-03-22  macho 
+    Consider alpha component of colors in data defined symbology
 
-	* i18n/qgis_ja.ts: translation update: ja by yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@15564
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 67a542b 95d7ec3
+William Kyngesburye 	2013-04-02
 
-2011-03-22  brushtyler 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: fix related to
-	r15547, manage lines out of the drawing rectangle (empty vectors of
-	points) git-svn-id: http://svn.osgeo.org/qgis/trunk@15563
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-22  brushtyler 
+    add framework path to link test to fix OS X SDK problem
 
-	* python/plugins/GdalTools/tools/dialogBase.py,
-	python/plugins/GdalTools/tools/extentSelector.py: remove the
-	clipping rectangle closing clipper, to fix #3664 git-svn-id: http://svn.osgeo.org/qgis/trunk@15562
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 87572f7 7a1b12f
+Nathan Woodrow 	2013-04-02
 
-2011-03-22  mhugent 
+    Merge pull request #450 from 3nids/showEditForm
+    
+    Do not wait for feature form closing for non-editable layers
 
-	* python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/gui/qgslegendinterface.h: Apply patch #3263 to fix adding of
-	groups to Legend. Provided by Marco Bernasocchi git-svn-id: http://svn.osgeo.org/qgis/trunk@15561
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-22  jef 
+    add framework path to link test to fix OS X SDK problem
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15560
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-02
 
-2011-03-22  jef 
+    translation string fixes and german translation update
 
-	* src/app/qgsmanageconnectionsdialog.cpp,
-	src/app/qgsnewhttpconnection.cpp, src/app/qgswmssourceselect.cpp,
-	src/ui/qgsnewhttpconnectionbase.ui,
-	src/ui/qgswmssourceselectbase.ui: [FEATURE] move option to ignore
-	GetMap and GetFeatureInfo URI from WMS GetCapabilities to connection git-svn-id: http://svn.osgeo.org/qgis/trunk@15559
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-02
 
-2011-03-22  jef 
+    indentation update
 
-	* src/providers/gdal/qgsgdalprovider.cpp,
-	src/ui/qgsprojectpropertiesbase.ui: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15558
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: b48c2dc a3634e2
+Jürgen Fischer 	2013-04-02
 
-2011-03-22  mhugent 
+    Merge pull request #486 from matthias-kuhn/attr-edit-dnd-multi
+    
+    Attribute editor (drag and drop layouter): Proper handling when multiple...
 
-	* src/app/qgsprojectproperties.cpp,
-	src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssldparser.h, src/mapserver/qgswmsserver.cpp,
-	src/ui/qgsprojectpropertiesbase.ui: Server: only show wkt geometry
-	in feature info response if selected by user git-svn-id: http://svn.osgeo.org/qgis/trunk@15557
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 255b467 1b7d94b
+Jürgen Fischer 	2013-04-02
 
-2011-03-22  brushtyler 
+    Merge pull request #488 from edigonzales/master
+    
+    http referer for wm(t)s requests
 
-	* python/plugins/GdalTools/tools/doClipper.py: fixed bug in
-	gdaltools clipper git-svn-id: http://svn.osgeo.org/qgis/trunk@15556
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: c4645ea b035527
+Jürgen Fischer 	2013-04-02
 
-2011-03-21  brushtyler 
+    Merge pull request #496 from matthias-kuhn/fix-7483
+    
+    [FIX  #7483] Attribute table changed selection on layer twice subsequent...
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPluginBase.py: trying to avoid
-	strange closing of the tools git-svn-id: http://svn.osgeo.org/qgis/trunk@15555
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 00ae45b 002f73e
+Jürgen Fischer 	2013-04-02
 
-2011-03-21  macho 
+    Merge pull request #495 from matthias-kuhn/fix-7485
+    
+    [FIX #7485]: Don't crash when expression fails to parse in dual view/preview column.
 
-	* i18n/qgis_fr.ts: translation update: fr by JRM git-svn-id: http://svn.osgeo.org/qgis/trunk@15554
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-21  ddehaan 
+    don't _re_create fake grass lib sources on reconfigure unless gisdefs.h has changed, saves a lot of reconfigure time
 
-	* src/plugins/sqlanywhere/sqlanywhere.cpp: Re-enabled toolbar button
-	for SQL Anywhere plugin.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15553
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-21  jef 
+    unset temporary LIB_PATH var
 
-	* src/app/qgssnappingdialog.cpp: fix #3656 git-svn-id: http://svn.osgeo.org/qgis/trunk@15552
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-21  jef 
+    more OS X install updates
 
-	* debian/control: fix #3654 git-svn-id: http://svn.osgeo.org/qgis/trunk@15550
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-02
 
-2011-03-21  macho 
+    clean up qscintilla bundling
 
-	* i18n/qgis_sr_CS-Latn.ts, i18n/qgis_sr_CS.ts: translation update:
-	renaming of sr_CS to fit upcoming cyrillic version git-svn-id: http://svn.osgeo.org/qgis/trunk@15549
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-02
 
-2011-03-21  macho 
+    [FIX] Show attribute table for layers without geometry
+    And add a message to the message log when an iterator is closed due to missing geometry
 
-	* i18n/qgis_hr_HR.ts: translation update: hr_HR by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@15548
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-02
 
-2011-03-21  mhugent 
+    vector cache: don't try to request geometries, if there aren't any
 
-	* src/core/qgsclipper.h, src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.cpp: Modify polygon clipping
-	to clip close to the drawing rectangle. Should now solve the
-	clipping for print composer too git-svn-id: http://svn.osgeo.org/qgis/trunk@15547
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-02
 
-2011-03-20  jef 
+    [FIX  #7483] Attribute table changed selection on layer twice subsequently
+    This led to a crash and was superfluent
 
-	* i18n/qgis_de.ts: fix version strings in german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15546
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-02
 
-2011-03-20  jef 
+    widget fixes:
+    - add sip bindings for new widgets (and some other missing pieces)
+    - change Webview to WebView (like in QWebView)
+    - use proxy settings also for webview widget
+    - don't disable Photo and webview widget
+    - use smooth transformation in photo widget
+    - show disabled color button with dotted border in actual color instead of
+      grayed-out
 
-	* src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h: 
-	optimize snapping dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15545
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-04-02
 
-2011-03-20  macho 
+    Don't crash when QgsExpression parser fails to parse a preview column (e.g. column without name)
+    Also removed throwing exception as this has been discouraged.
 
-	* i18n/qgis_sr_CS.ts: add translation: new translation Serbia by
-	Goran Ivankivic .. many thanks git-svn-id: http://svn.osgeo.org/qgis/trunk@15544
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4f6c2d2 60c20ab
+Tim Sutton 	2013-04-02
 
-2011-03-20  macho 
+    Merge pull request #494 from palmerj/wfs_ui_improvements
+    
+    WFS Layer Selection UI Improvements
 
-	* i18n/qgis_es.ts: translation update: es by Carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15543
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Jeremy Palmer 	2013-04-02
 
-2011-03-20  macho 
+    Remove unused variables
 
-	* i18n/qgis_cs_CZ.ts: translation update: cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@15542
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Jeremy Palmer 	2013-04-02
 
-2011-03-20  macho 
+    Add option for using WFS type name title for the added layer name
 
-	* i18n/qgis_ru.ts: translation update: ru by Artem git-svn-id: http://svn.osgeo.org/qgis/trunk@15541
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Jeremy Palmer 	2013-04-02
 
-2011-03-19  jef 
+    Changed back to ExtendedSelection mode for the WFS item view
 
-	* src/core/raster/qgsrasterlayer.cpp: fix build error introduced
-	with r15539 git-svn-id: http://svn.osgeo.org/qgis/trunk@15540
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Jeremy Palmer 	2013-04-02
 
-2011-03-19  jef 
+    Added Filter search for WFS layers. Also improved the treeView to have better column and row layout
 
-	* debian/pencil.uu, resources/context_help/RgSettingsDlg-de_DE,
-	resources/context_help/RgShortestPathWidget-de_DE,
-	src/astyle/ASBeautifier.cpp, src/astyle/ASEnhancer.cpp,
-	src/astyle/ASFormatter.cpp, src/astyle/ASResource.cpp,
-	src/astyle/astyle.h, src/astyle/astyle_main.cpp,
-	src/astyle/license.html, src/core/raster/qgsrasterlayer.cpp,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp,
-	src/plugins/spatialquery/CMakeLists.txt,
-	src/plugins/spatialquery/README,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.qrc,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h,
-	src/ui/qgsoptionsbase.ui, src/ui/qgsrendererrulepropsdialogbase.ui,
-	tools/qgiscommit: fix some warnings and other cleanups git-svn-id: http://svn.osgeo.org/qgis/trunk@15539
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 3d15e67 af7d6f8
+William Kyngesburye 	2013-04-01
 
-2011-03-19  rblazek 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/core/qgsrasterdataprovider.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h: progress signals git-svn-id: http://svn.osgeo.org/qgis/trunk@15538
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-19  jef 
+    OS X install updates
 
-	* src/core/qgsrasterprojector.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15537
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-02
 
-2011-03-19  jef 
+    osgeo4w release preparations
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15536
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-01
 
-2011-03-19  rblazek 
+    [sextante] more tests. Added extra model and script
 
-	* src/core/qgsrasterdataprovider.cpp: another shift fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15535
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-01
 
-2011-03-19  rblazek 
+    [sextante] modified OTB description to adapt to 3.16
 
-	* src/providers/gdal/qgsgdalprovider.cpp: tmp block size calc fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15534
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-01
 
-2011-03-18  rblazek 
+    [sextante] added checking to GRASS algorithms
 
-	* src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterprojector.cpp, src/core/qgsrasterprojector.h: 
-	align extent according to src resolution/origin git-svn-id: http://svn.osgeo.org/qgis/trunk@15533
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-04-01
 
-2011-03-18  brushtyler 
+    Fixed problem with duplicated recent algorithms tree.
+    
+    Also fixed  blocking typo in modeler code, introduced in last commit, and two minor changes in saga
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui,
-	python/plugins/GdalTools/tools/widgetDEM.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPolygonize.ui,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: fix #3637 git-svn-id: http://svn.osgeo.org/qgis/trunk@15532
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-18  jef 
+    handle spaces in install_names (for real this time)
 
-	* debian/control.sid, src/app/qgsvectorlayerproperties.cpp,
-	src/plugins/sqlanywhere/sasourceselectbase.ui: fix nightly build git-svn-id: http://svn.osgeo.org/qgis/trunk@15531
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-17  rblazek 
+    handle spaces in install_names
 
-	* src/providers/gdal/qgsgdalprovider.cpp: throw away all the tricks
-	and do second resampling, it is quite fast git-svn-id: http://svn.osgeo.org/qgis/trunk@15530
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-17  mhugent 
+    always search /Library/Frameworks for linking on OS X in case SDK won't
 
-	* src/analysis/vector/qgszonalstatistics.cpp: update field map after
-	zonal statistics git-svn-id: http://svn.osgeo.org/qgis/trunk@15529
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-01
 
-2011-03-17  mhugent 
+    Bring cap style combo box back (got lost somehow while merging the branch)
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix for raster printing, #3622 git-svn-id: http://svn.osgeo.org/qgis/trunk@15528
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-17  jef 
+    clarify and expand Mac bundling info
 
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h: heck, fix #3620 git-svn-id: http://svn.osgeo.org/qgis/trunk@15527
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-17  mhugent 
+    remove very old v1.0 Mac stuff
 
-	* src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalcnode.h,
-	src/analysis/raster/qgsrastercalcparser.yy,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/analysis/raster/qgsrastermatrix.h: Add support for unary minus
-	in raster calculator. Fixes ticket 3627 git-svn-id: http://svn.osgeo.org/qgis/trunk@15526
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e68b322 d971a69
+William Kyngesburye 	2013-04-01
 
-2011-03-17  jef 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/core/qgsdiagram.cpp, src/core/qgsdiagram.h: fix nightly build git-svn-id: http://svn.osgeo.org/qgis/trunk@15525
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+William Kyngesburye 	2013-04-01
 
-2011-03-16  macho 
+    update OS X identifiers for version 2
 
-	* i18n/qgis_es.ts: translation update: es by Carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@15524
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-01
 
-2011-03-16  jef 
+    sneak in color edit widget to accompany data defined symbology
 
-	* src/gui/qgsprojectionselector.cpp,
-	src/gui/qgsprojectionselector.h: fix #3624 git-svn-id: http://svn.osgeo.org/qgis/trunk@15523
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-04-01
 
-2011-03-16  jef 
+    translations update: gl_ES by Xan
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15522
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-04-01
 
-2011-03-16  jef 
+    Also use different settings file for customisations
 
-	* src/providers/ogr/qgsogrprovider.cpp: ogr provider: fix redraw
-	after attribute table update git-svn-id: http://svn.osgeo.org/qgis/trunk@15521
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-04-01
 
-2011-03-16  jef 
+    Data defined symbol UI clean up
+    
+- Reduce margins           
+- Remove cell selection           
+- Adjust first column width           
 
-	* src/core/raster/qgsrasterlayer.cpp: fix #3626 git-svn-id: http://svn.osgeo.org/qgis/trunk@15520
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 6c3f418 7b6e322
+Tim Sutton 	2013-04-01
 
-2011-03-16  alexbruy 
+    Merge branch 'composer_blend' of https://github.com/nyalldawson/Quantum-GIS
 
-	* resources/context_help/RgSettingsDlg-ru_RU,
-	resources/context_help/RgShortestPathWidget-ru_RU: minor fixes in
-	russian RoadGraph online help git-svn-id: http://svn.osgeo.org/qgis/trunk@15519
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-04-01
 
-2011-03-16  jef 
+    Use ~.qgis2 and ~/.config/QuantumGIS/QGIS2.conf for settings for QGIS 2. Added unit test for memory provider.
 
-	* src/core/qgsvectorfilewriter.cpp: allow multiple extensions in
-	save as (eg. for mapinfo mif/tab) git-svn-id: http://svn.osgeo.org/qgis/trunk@15518
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-01
 
-2011-03-16  borysiasty 
+    fix two more warnings
 
-	* src/app/qgisapp.cpp: fix #3590 git-svn-id: http://svn.osgeo.org/qgis/trunk@15517
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-01
 
-2011-03-16  jef 
+    [FEATURE] Transparency control for composer items
 
-	* src/core/qgsvectorlayer.h: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15516
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-04-01
 
-2011-03-16  borysiasty 
+    Fix printing with composition effects
 
-	* src/ui/qgsfieldcalculatorbase.ui: make field calculator geometry
-	netbook-friendly git-svn-id: http://svn.osgeo.org/qgis/trunk@15515
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-03-31
 
-2011-03-16  rblazek 
+    [FEATURE] Blend modes for composer items
 
-	* src/providers/gdal/qgsgdalprovider.cpp: better resampling
-	alignment git-svn-id: http://svn.osgeo.org/qgis/trunk@15514
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-01
 
-2011-03-16  mhugent 
+    german translation update
 
-	* src/core/qgsmaprenderer.h, src/core/qgsvectorlayer.cpp: Fix
-	diagrams git-svn-id: http://svn.osgeo.org/qgis/trunk@15513
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-04-01
 
-2011-03-16  brushtyler 
+    fix build error and a warning
 
-	* python/plugins/GdalTools/tools/doContour.py: fix related to #3100
-	and missed in r15474 git-svn-id: http://svn.osgeo.org/qgis/trunk@15512
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2b34ae5 9b0c455
+Marco Hugentobler 	2013-04-01
 
-2011-03-16  jef 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/app/qgsmaptoollabel.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/core/CMakeLists.txt,
-	src/core/qgsdiagram.cpp, src/core/qgsdiagramrendererv2.h,
-	src/core/qgspallabeling.cpp, src/core/qgspallabeling.h,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/plugins/dxf2shp_converter/CMakeLists.txt,
-	src/plugins/oracle_raster/CMakeLists.txt,
-	src/plugins/sqlanywhere/CMakeLists.txt: exclude pal headers from API
-	and install qgsdiagramrendererv2.h git-svn-id: http://svn.osgeo.org/qgis/trunk@15511
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5c028f8 8a0b0fe
+Marco Hugentobler 	2013-04-01
 
-2011-03-16  stopa85 
+    [Feature]: Merge data defined symbology branch
 
-	* src/app/qgsmeasuretool.cpp: fix deprecated warnings:
-	mapCanvas()->mapRenderer()->distanceArea() git-svn-id: http://svn.osgeo.org/qgis/trunk@15510
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-04-01
 
-2011-03-16  jef 
+    Fix column resize in fields grid, add sorting, reduce margins
 
-	* src/plugins/oracle_raster/CMakeLists.txt: fix build git-svn-id: http://svn.osgeo.org/qgis/trunk@15509
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-01
 
-2011-03-16  jef 
+    Add export macro
 
-	* src/app/qgsrasterlayerproperties.cpp: fix histogram crash git-svn-id: http://svn.osgeo.org/qgis/trunk@15508
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9247262 30c343c
+Nathan Woodrow 	2013-03-31
 
-2011-03-15  jef 
+    Merge pull request #452 from minorua/tablejoin
+    
+    Some fixes for table join. Merged for wider testing.
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgsdiagramrendererv2.h, src/core/qgsvectorlayer.h: fix
-	warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15507
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-04-01
 
-2011-03-15  jef 
+    Clean legacy code in ellipse symbol layer
 
-	* src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h: gdal provider: change handling
-	of crs git-svn-id: http://svn.osgeo.org/qgis/trunk@15506
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-31
 
-2011-03-15  mhugent 
+    data defined properties for ellipse symbol layer
 
-	* src/core/qgsdiagramrendererv2.h: Add some core_exports git-svn-id: http://svn.osgeo.org/qgis/trunk@15505
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-03-31
 
-2011-03-15  jef 
+    added function help files for pi
 
-	* src/app/qgsvectorlayerproperties.cpp, src/core/qgsclipper.h,
-	src/core/qgsdiagram.h, src/core/qgsdiagramrendererv2.h,
-	src/core/qgsmaprenderer.h, src/core/qgspallabeling.cpp,
-	src/mapserver/qgsfilter.cpp,
-	src/plugins/dxf2shp_converter/CMakeLists.txt,
-	src/plugins/sqlanywhere/CMakeLists.txt: fix warnings and windows
-	build git-svn-id: http://svn.osgeo.org/qgis/trunk@15504
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-31
 
-2011-03-15  mhugent 
-
-	* python/core/qgsdiagramrendererv2.sip,
-	src/analysis/interpolation/qgsinterpolator.cpp,
-	src/app/qgisapp.cpp, src/app/qgslabelpropertydialog.cpp,
-	src/app/qgsmaptoollabel.cpp, src/app/qgsmaptoollabel.h,
-	src/app/qgsmaptoolmovelabel.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h, src/core/CMakeLists.txt,
-	src/core/qgsdiagram.cpp, src/core/qgsdiagram.h,
-	src/core/qgsdiagramrendererv2.cpp, src/core/qgsdiagramrendererv2.h,
-	src/core/qgslabelsearchtree.cpp, src/core/qgslabelsearchtree.h,
-	src/core/qgsmaprenderer.h, src/core/qgspallabeling.cpp,
-	src/core/qgspallabeling.h, src/core/qgsrendercontext.h,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/gui/qgsmaptip.cpp,
-	src/plugins/CMakeLists.txt,
-	src/plugins/grass/qgsgrassedittools.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h,
-	src/providers/grass/qgsgrassprovider.h,
-	src/providers/memory/qgsmemoryprovider.h,
-	src/providers/osm/osmprovider.cpp, src/providers/osm/osmprovider.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.h,
-	src/ui/qgsvectorlayerpropertiesbase.ui: [FEATURE] Add diagram system
-	that uses the same pal instance as labeling-ng git-svn-id: http://svn.osgeo.org/qgis/trunk@15503
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  jef 
-
-	* src/providers/ogr/qgsogrprovider.cpp: ogr provider: improve
-	detection of CRS git-svn-id: http://svn.osgeo.org/qgis/trunk@15502
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  jef 
-
-	* resources/context_help/CMakeLists.txt,
-	resources/context_help/RgSettingsDlg-de_DE,
-	resources/context_help/RgSettingsDlg-en_US,
-	resources/context_help/RgShortestPathWidget-de_DE,
-	resources/context_help/RgShortestPathWidget-en_US: improve english
-	roadgraph online help and add german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15501
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  mhugent 
-
-	* src/core/qgsclipper.h, src/core/symbology-ng/qgssymbollayerv2.cpp: 
-	Port polygon clip for symbology-ng from threading branch. Fixes
-	freezes when zooming in git-svn-id: http://svn.osgeo.org/qgis/trunk@15500
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  stopa85 
-
-	* resources/context_help/RgSettingsDlg-en_US,
-	resources/context_help/RgSettingsDlg-ru_RU,
-	resources/context_help/RgShortestPathWidget-en_US,
-	resources/context_help/RgShortestPathWidget-ru_RU,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/shortestpathwidget.h: Add help system to Road
-	graph plugin. Please check english text.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15499
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  jef 
-
-	* src/app/qgisapp.cpp: [FEATURE] default to last selection when
-	prompting for CRS git-svn-id: http://svn.osgeo.org/qgis/trunk@15498
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  brushtyler 
-
-	* python/plugins/GdalTools/tools/doDEM.py,
-	python/plugins/GdalTools/tools/widgetDEM.ui: added algorithm option
-	to gdaldem git-svn-id: http://svn.osgeo.org/qgis/trunk@15497
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  macho 
-
-	* i18n/qgis_ja.ts: translation update: .ja by Yoichi (best wishes
-	for Japan git-svn-id: http://svn.osgeo.org/qgis/trunk@15496
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  brushtyler 
-
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/resources.qrc,
-	python/plugins/GdalTools/tools/doDEM.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/widgetDEM.ui: [FEATURE] added GUI for
-	gdaldem, to fix #3064 git-svn-id: http://svn.osgeo.org/qgis/trunk@15495
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: BIG string update to prepare
-	1.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@15494
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-15  jef 
+    german translation update
 
-	* i18n/qgis_de.ts,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp: translation
-	string fix and german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15493
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-31
 
-2011-03-15  timlinux 
+    indentation update
 
-	* src/plugins/spatialquery/qgsspatialquerydialogbase.ui: Small
-	change to spatial query text git-svn-id: http://svn.osgeo.org/qgis/trunk@15492
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-31
 
-2011-03-15  timlinux 
+    [FEATURE] add widgets for photos and webpages
 
-	* : Updated icons for spatial query plugin from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15491
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-30
 
-2011-03-14  jef 
+    [FEATURE] allow non-numeric keys in postgres and oracle views
 
-	* src/providers/grass/qgsgrass.cpp: fix #3582 git-svn-id: http://svn.osgeo.org/qgis/trunk@15490
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-30
 
-2011-03-14  mmassing 
+    fix warnings on ignored return values
 
-	* src/providers/gdal/qgsgdalprovider.cpp: Amend previous commit:
-	call method after null-pointer check (sorry).  git-svn-id: http://svn.osgeo.org/qgis/trunk@15489
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-31
 
-2011-03-14  mmassing 
+    More data defined symbology for svg marker symbol layer
 
-	* src/providers/gdal/qgsgdalprovider.cpp: Fix VRT wrapping for
-	south-up datasets.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15488
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Borys Jurgiel 	2013-03-31
 
-2011-03-14  mmassing 
+    Fix shapefile encoding in QgsVectorFileWriter
 
-	* src/providers/gdal/qgsgdalprovider.cpp: Clean up a few assignments
-	I left abandoned.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15487
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-31
 
-2011-03-14  borysiasty 
+    Data defined properties for svg marker
 
-	* images/images.qrc: more gis theme icons from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15486
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-03-31
 
-2011-03-14  rduivenvoorde 
+    added pi as a selectable constant
+    
+    pi can be found under Math in Fieldcalculator
 
-	* python/plugins/mapserver_export/mapserverexport.py,
-	python/plugins/mapserver_export/ms_export.py: added a warning when
-	using 'new symbology' see #2994 git-svn-id: http://svn.osgeo.org/qgis/trunk@15485
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-31
 
-2011-03-14  timlinux 
+    Rename Save as style to Save in symbol library
 
-	* src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp: Updates for
-	spatial query plugin from Luiz.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15484
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 7d9f444 daeafcc
+Nathan Woodrow 	2013-03-30
 
-2011-03-14  jef 
+    Merge pull request #491 from borysiasty/master
+    
+    [API] expose mouse wheel to map tools, use it for zoom only if no keyboard modifier pressed
 
-	* python/core/qgsrect.sip, src/core/qgsrectangle.h: fix #3611 git-svn-id: http://svn.osgeo.org/qgis/trunk@15483
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-31
 
-2011-03-14  jef 
+    Move Init function line edit so visible all the time
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.h,
-	src/plugins/wfs/qgswfssourceselectbase.ui,
-	src/ui/qgsdbsourceselectbase.ui, src/ui/qgswmssourceselectbase.ui: 
-	fix #3617 git-svn-id: http://svn.osgeo.org/qgis/trunk@15482
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-30
 
-2011-03-14  mmassing 
+    Fix cyclical QPaintEvent updates for color button, which caused excessive cpu cycles
 
-	* src/providers/gdal/qgsgdalprovider.cpp: Fix #3596 git-svn-id: http://svn.osgeo.org/qgis/trunk@15481
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-31
 
-2011-03-14  jef 
+    Add eval to QgsPythonRunner.
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15480
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-31
 
-2011-03-14  jef 
+    Reload form module if DEBUGMODE switch set in module
 
-	* src/app/qgsmanageconnectionsdialog.cpp,
-	src/app/qgsmanageconnectionsdialog.h,
-	src/plugins/wfs/CMakeLists.txt,
-	src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.h: fix #3616 git-svn-id: http://svn.osgeo.org/qgis/trunk@15479
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Borys Jurgiel 	2013-03-30
 
-2011-03-14  jef 
+    [API] Expose mouse wheel to map tools as QgsMapTool::wheelEvent()
 
-	* src/app/qgsnewhttpconnection.cpp, src/app/qgsnewhttpconnection.h: 
-	fix #3615 git-svn-id: http://svn.osgeo.org/qgis/trunk@15478
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Borys Jurgiel 	2013-03-30
 
-2011-03-14  jef 
+    Don't zoom with mouse wheel if keyboard modifiers pressed
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/qgsnewhttpconnection.cpp, src/app/qgswmssourceselect.cpp,
-	src/app/spatialite/qgsnewspatialitelayerdialog.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.cpp: fix #3614 git-svn-id: http://svn.osgeo.org/qgis/trunk@15477
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-30
 
-2011-03-14  brushtyler 
+    [sextante] modeler improvements: added 'save as' button and fixed issue with line endings.
+    
+    Added more tests
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/widgetWarp.ui: added -cutline option
-	to gdaltools warp tool, to fix #3066 git-svn-id: http://svn.osgeo.org/qgis/trunk@15476
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-30
 
-2011-03-14  rduivenvoorde 
+    [sextante] improved error messages when algorithm execution fails
 
-	* python/plugins/mapserver_export/mapserverexportdialog.py: fix for
-	#2875 unit list in mapserver export plugin untranslatable git-svn-id: http://svn.osgeo.org/qgis/trunk@15475
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-30
 
-2011-03-14  brushtyler 
+    german translation update
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/dialogBase.py,
-	python/plugins/GdalTools/tools/doAbout.py,
-	python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/doInfo.py,
-	python/plugins/GdalTools/tools/doNearBlack.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/doPctRgb.py,
-	python/plugins/GdalTools/tools/doPolygonize.py,
-	python/plugins/GdalTools/tools/doProximity.py,
-	python/plugins/GdalTools/tools/doRasterize.py,
-	python/plugins/GdalTools/tools/doRgbPct.py,
-	python/plugins/GdalTools/tools/doSettings.py,
-	python/plugins/GdalTools/tools/doSieve.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/widgetPluginBase.py: refresh list of
-	layers when layers in TOC change git-svn-id: http://svn.osgeo.org/qgis/trunk@15474
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-14  jef 
-
-	* src/core/raster/qgsrasterlayer.cpp: fix/reintroduce wms layer
-	transparency git-svn-id: http://svn.osgeo.org/qgis/trunk@15473
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-14  jef 
-
-	* src/app/qgstilescalewidget.cpp, src/core/qgsrasterprojector.cpp: 
-	fix #3608 git-svn-id: http://svn.osgeo.org/qgis/trunk@15472
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-14  brushtyler 
-
-	* python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: allow output size in
-	grid tool to fix #2941 git-svn-id: http://svn.osgeo.org/qgis/trunk@15471
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  brushtyler 
-
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doClipper.py: make gdaltools clipper
-	working with the raster provider git-svn-id: http://svn.osgeo.org/qgis/trunk@15470
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-30
 
-2011-03-13  brushtyler 
+    fix warnings
 
-	* python/plugins/GdalTools/tools/doRasterize.py,
-	python/plugins/GdalTools/tools/doTileIndex.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/widgetRasterize.ui: added raster
-	creation in rasterize tool, to fix #3545 git-svn-id: http://svn.osgeo.org/qgis/trunk@15469
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15467
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  borysiasty 
-
-	* src/app/legend/qgslegendlayer.cpp, src/ui/qgisapp.ui: language fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15466
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  jef 
-
-	* src/plugins/grass/qgsgrassnewmapset.cpp: fix #3602 git-svn-id: http://svn.osgeo.org/qgis/trunk@15465
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  timlinux 
-
-	* python/gui/qgisinterface.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/wfs/qgswfsplugin.cpp: Renamed removeAddLayer to
-	removeAddLayerAction git-svn-id: http://svn.osgeo.org/qgis/trunk@15464
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  timlinux 
-
-	* python/gui/qgisinterface.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/wfs/qgswfsplugin.cpp: Replaced addAddLayer with
-	insertAddLayerAction git-svn-id: http://svn.osgeo.org/qgis/trunk@15463
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15462
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-13  jef 
-
-	* python/gui/qgisinterface.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/wfs/qgswfsplugin.cpp, src/ui/qgisapp.ui: [FEATURE] layer
-	menu function - deprecated QgisInterface separator methods - add addAddLayer/removeAddLayer methods to QgisInterface to   add entries to the layer menu - port plugins to use it git-svn-id: http://svn.osgeo.org/qgis/trunk@15461
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-03-30
 
-2011-03-13  timlinux 
+    Mark srsDimesion unused - see https://github.com/qgis/Quantum-GIS/commit/93e02598438ca9526de5a451b0918e7ae365b7ac#commitcomment-2871379
 
-	* images/images.qrc,
-	images/themes/default/mActionFullHistogramStretch.svg,
-	images/themes/gis/mActionZoomActual.svg,
-	python/core/qgsrasterlayer.sip, src/app/legend/qgslegend.cpp,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/ui/qgisapp.ui: Added zoom 1:1
-	to zoom bar, icon updates from robert. Disallow hist stretch for wms
-	layers git-svn-id: http://svn.osgeo.org/qgis/trunk@15460
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 72b476e 86ba94b
+Nathan Woodrow 	2013-03-30
 
-2011-03-13  brushtyler 
+    Merge pull request #490 from nyalldawson/heatmap_fixes
+    
+    Choose sensible default value for heatmap radius, some small documentation updates
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py: make tools
-	working with the raster provider git-svn-id: http://svn.osgeo.org/qgis/trunk@15459
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-03-30
 
-2011-03-12  jef 
+    Update heatmap help file
 
-	* src/app/qgswmssourceselect.cpp: fix #3591 git-svn-id: http://svn.osgeo.org/qgis/trunk@15458
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-03-30
 
-2011-03-12  jef 
+    Cleanup heatmap dialog strings to follow standard capitalisation
 
-	* src/app/qgswmssourceselect.cpp,
-	src/providers/wms/qgswmsprovider.cpp: fix #3585 git-svn-id: http://svn.osgeo.org/qgis/trunk@15457
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+nyalldawson 	2013-03-30
 
-2011-03-12  borysiasty 
+    Estimate a sensible default radius for heatmaps from the layer extent
 
-	* images/images.qrc: fix r15455 git-svn-id: http://svn.osgeo.org/qgis/trunk@15456
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-30
 
-2011-03-12  timlinux 
+    Data defined properties for point pattern symbollayer
 
-	* images/images.qrc,
-	images/themes/default/mIconRenderingDisabled.svg,
-	images/themes/default/mIconRenderingEnabled.svg,
-	images/themes/default/mIconStopRendering.svg,
-	images/themes/gis/mIconLineLayer.svg,
-	images/themes/gis/mIconPointLayer.svg,
-	images/themes/gis/mIconPolygonLayer.svg,
-	images/themes/gis/mIconTableLayer.svg, src/app/qgisapp.cpp: On
-	discussion with Robert, also use desaturated icons for layer type
-	icons. Updated stop rendering icon with one contributed by Robert.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15455
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-30
 
-2011-03-12  jef 
+    Pass fields into new feature in add tool
 
-	* src/app/qgsmaptoolsplitfeatures.cpp: "fix" #3593 git-svn-id: http://svn.osgeo.org/qgis/trunk@15454
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-03-30
 
-2011-03-12  jef 
+    Add overload for QgsFeature with QgsFields
 
-	* src/core/qgsproject.cpp, src/core/raster/qgsrasterlayer.cpp,
-	src/providers/gdal/qgsgdalprovider.cpp: apply #3594 git-svn-id: http://svn.osgeo.org/qgis/trunk@15453
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-12  jef 
+Merge: 6e75ea4 de7dd71
+Werner Macho 	2013-03-29
 
-	* src/gui/qgsprojectionselector.cpp: fix: center selected item in
-	CRS selection git-svn-id: http://svn.osgeo.org/qgis/trunk@15452
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #489 from tomass/master
+    
+    lithuanian translation update
 
-2011-03-12  cfarmer 
+Tomas 	2013-03-29
 
-	* python/plugins/fTools/tools/doGeometry.py: fixes problem with
-	output type when using multipart to singleparts tool. Thanks to Luiz
-	Motta for the fix.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15451
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Lithuanian translations
 
-2011-03-12  mhugent 
+Marco Hugentobler 	2013-03-29
 
-	* src/core/qgsproject.cpp,
-	src/core/renderer/qgscontinuouscolorrenderer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.cpp: Fix loading of joined
-	layers with old symbology, #121 git-svn-id: http://svn.osgeo.org/qgis/trunk@15450
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined symbology for line pattern symbol layer
 
-2011-03-12  jef 
+Stefan Ziegler 	2013-03-29
 
-	* i18n/qgis_de.ts, src/app/qgisapp.cpp: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15449
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    back to wms only
 
-2011-03-12  jef 
+Marco Hugentobler 	2013-03-29
 
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsmarker.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolselectutils.cpp, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsprojectproperties.cpp,
-	src/core/composer/qgscomposermap.cpp, src/core/qgsmaprenderer.cpp,
-	src/core/qgspallabeling.cpp, src/gui/qgsmapoverviewcanvas.cpp,
-	src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsprojectparser.cpp, src/mapserver/qgswmsserver.cpp,
-	src/plugins/coordinate_capture/coordinatecapture.cpp,
-	src/plugins/north_arrow/plugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp: fix #3590 and
-	crs warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15448
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined properties for SVG fill symbol layer
 
-2011-03-12  timlinux 
+Stefan Ziegler 	2013-03-29
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: [FEATURE] show active crs
-	in status bar. Closes #3590 git-svn-id: http://svn.osgeo.org/qgis/trunk@15447
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    referer for wfs: one has to modify a lot... stop here and consider only wms
 
-2011-03-12  timlinux 
+Juergen E. Fischer 	2013-03-29
 
-	* : Use muted icons in status bar (based on article I read on a non
-	distracting ui) git-svn-id: http://svn.osgeo.org/qgis/trunk@15446
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2011-03-12  timlinux 
+Stefan Ziegler 	2013-03-29
 
-	* src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h: Deprecate
-	the use of SRS in favour of CRS in api git-svn-id: http://svn.osgeo.org/qgis/trunk@15445
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    referer works for wms/wmts
 
-2011-03-12  timlinux 
+Marco Hugentobler 	2013-03-29
 
-	* src/ui/qgisapp.ui: Try better default arrangement of icons git-svn-id: http://svn.osgeo.org/qgis/trunk@15444
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix data defined size for simple marker. Propagate scale method to symbol layers
 
-2011-03-12  timlinux 
+Radim Blazek 	2013-03-29
 
-	* src/app/qgisapp.cpp: Be a little more generous with the space
-	allocated for coordinate and extent display so it doesnt get
-	truncated.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15443
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend minor fixes
 
-2011-03-12  timlinux 
+Marco Hugentobler 	2013-03-29
 
-	* images/themes/gis/qgis-ikony.diff: Deleted this file - I think it
-	was added by mistake git-svn-id: http://svn.osgeo.org/qgis/trunk@15442
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined properties for simple fill
 
-2011-03-12  timlinux 
+Minoru Akagi 	2013-03-21
 
-	* src/core/qgsprojectfiletransform.cpp: Added null based transformer
-	rules for qgis 1.6 - 17 projects and other missing ones for older
-	releases.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15441
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix broken compatibility of table join (project file) (fix #7068)
 
-2011-03-12  borysiasty 
+Victor Olaya 	2013-03-29
 
-	* images/images.qrc,
-	images/themes/gis/mActionChangeLabelProperties.svg,
-	images/themes/gis/mActionLabeling.svg,
-	images/themes/gis/mActionMoveLabel.svg,
-	images/themes/gis/mActionRotateLabel.svg,
-	images/themes/gis/qgis-ikony.diff, src/app/qgisapp.cpp: more gis
-	theme icons from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15440
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] modeler tests
 
-2011-03-11  jef 
+Victor Olaya 	2013-03-28
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15439
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added Polygonize algorithm by Piotr Pociask
 
-2011-03-11  jef 
+Victor Olaya 	2013-03-28
 
-	* src/core/qgsvectorfilewriter.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: fix #3595 git-svn-id: http://svn.osgeo.org/qgis/trunk@15438
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added some extra space in modeler for inputs tab
 
-2011-03-11  jef 
+Victor Olaya 	2013-03-28
 
-	* src/core/qgsmaplayer.cpp: update old delimited text provider
-	datasources on load git-svn-id: http://svn.osgeo.org/qgis/trunk@15437
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante]Saga algorithms can now have harcoded values in description.
+    
+    Modified SAGA descriptions accordingly and fixed Layer importer to avoid duplicated extensions
 
-2011-03-11  jef 
+Victor Olaya 	2013-03-28
 
-	* src/core/qgis.h, src/gui/qgsmapcanvasmap.h: missed two files in
-	r15435 git-svn-id: http://svn.osgeo.org/qgis/trunk@15436
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] Tests stuff. Added new test models and scripts, geojson testdata and extra tests
 
-2011-03-11  jef 
+Victor Olaya 	2013-03-28
 
-	* src/core/qgsapplication.h,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsdistancearea.h, src/core/qgslabel.h,
-	src/core/qgsmaplayer.h, src/core/qgsmaprenderer.h,
-	src/core/qgsoverlayobject.h, src/core/qgsrasterdataprovider.h,
-	src/core/qgssearchtreenode.h, src/core/qgsvectordataprovider.h,
-	src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayer.h,
-	src/gui/qgisinterface.h, src/gui/qgsgenericprojectionselector.h,
-	src/gui/qgsmapcanvas.h, src/gui/qgsprojectionselector.h: replace our
-	QGISDEPRECATED with Qt's Q_DECL_DEPRECATED git-svn-id: http://svn.osgeo.org/qgis/trunk@15435
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added "delete R script" action
 
-2011-03-11  mhugent 
+Merge: 93ade1f d056d5f
+Werner Macho 	2013-03-28
 
-	* src/app/qgsrastercalcdialog.cpp: Minor change for raster
-	calculator dialog to get the gdal layers git-svn-id: http://svn.osgeo.org/qgis/trunk@15434
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #487 from SrNetoChan/master
+    
+    New translations and some updates to PT-pt
 
-2011-03-11  timlinux 
+Alexandre Neto 	2013-03-28
 
-	* src/app/qgisapp.cpp: Enable/disable raster icons based on context
-	of which layer is active git-svn-id: http://svn.osgeo.org/qgis/trunk@15433
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    reverse 'help.css' file to previous commit
 
-2011-03-11  timlinux 
+Marco Hugentobler 	2013-03-28
 
-	* images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/ui/qgisapp.ui: [FEATURE] Added
-	histogram stretch to full dataset icon to raster toolbar git-svn-id: http://svn.osgeo.org/qgis/trunk@15432
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix data defined symbology for embedded layers
 
-2011-03-11  timlinux 
+Marco Hugentobler 	2013-03-28
 
-	* src/app/qgisapp.cpp: Fix histogram stretch tool so that it works
-	with multiband colour images too git-svn-id: http://svn.osgeo.org/qgis/trunk@15431
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined shape for simple marker does not work yet
 
-2011-03-11  rduivenvoorde 
+Marco Hugentobler 	2013-03-28
 
-	* i18n/qgis_nl.ts: part of dutch translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15430
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined properties for simple marker (but shape will come later)
 
-2011-03-11  jef 
+Matthias Kuhn 	2013-03-28
 
-	* debian/control.sid: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15429
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Attribute editor (drag and drop layouter): Proper handling when multiple fields are dropped
 
-2011-03-11  pcav 
+Marco Hugentobler 	2013-03-28
 
-	* i18n/qgis_it.ts: Updated IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15428
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Data defined symbology for marker symbol layer
 
-2011-03-11  jef 
+Marco Hugentobler 	2013-03-28
 
-	* ms-windows/osgeo4w/qgis.bat.tmpl,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@15426
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Moved code for data defined simple line symbolisation into its own functions
 
-2011-03-10  borysiasty 
+Merge: 1b663bb 0f7e90b
+Nathan Woodrow 	2013-03-27
 
-	* src/app/qgisapp.cpp: Don't apply CRS settings to current project
-	after closing options box - it should only be used when a new
-	project is created. - continuation of r15421 git-svn-id: http://svn.osgeo.org/qgis/trunk@15425
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #480 from nyalldawson/hue_saturation
+    
+    Add hue and saturation controls for raster layers
 
-2011-03-10  borysiasty 
+Nathan Woodrow 	2013-03-28
 
-	* src/app/legend/qgslegendlayer.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/ui/qgisapp.ui: [FEATURE] Assign layer CRS to
-	project (legend context menu) git-svn-id: http://svn.osgeo.org/qgis/trunk@15424
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Get fid of newly added feature in mssql provider
 
-2011-03-10  rblazek 
+Larry Shaffer 	2013-03-27
 
-	* src/providers/gdal/qgsgdalprovider.cpp: alignment better, avoid
-	artifacts git-svn-id: http://svn.osgeo.org/qgis/trunk@15423
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove WA_DeleteOnClose attribute from QgsBusyIndicatorDialog
+    
+    - Add default title
 
-2011-03-10  rblazek 
+Larry Shaffer 	2013-03-27
 
-	* src/providers/gdal/qgsgdalprovider.cpp: alignment better git-svn-id: http://svn.osgeo.org/qgis/trunk@15422
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move busy indicator dialog out of composer and into own gui class
 
-2011-03-10  timlinux 
+Alexandre Neto 	2013-03-28
 
-	* src/app/qgisapp.cpp: Dont apply otf settings to current project
-	after closing options box - it should only be used when a new
-	project is created.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15421
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Some PT-pt translations and corrections
 
-2011-03-10  jef 
+Merge: d1825ec c9ef27c
+Nathan Woodrow 	2013-03-27
 
-	* src/app/qgshandlebadlayers.cpp, src/core/qgsmaplayer.cpp,
-	src/core/qgsproject.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: fix #3573
-	and apply #3570 git-svn-id: http://svn.osgeo.org/qgis/trunk@15420
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #485 from nyalldawson/blend_modes
+    
+    Blend modes pt 3 - blend modes for labels
 
-2011-03-10  jef 
+Merge: 8793d38 d1825ec
+Nyall Dawson 	2013-03-28
 
-	* python/core/qgscoordinatereferencesystem.sip,
-	src/app/qgisapp.cpp, src/app/qgsnewvectorlayerdialog.cpp,
-	src/app/qgsoptions.cpp, src/app/qgswmssourceselect.cpp,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsdistancearea.cpp, src/core/qgsvectorlayer.cpp,
-	src/gui/qgsgenericprojectionselector.h,
-	src/plugins/north_arrow/plugin.cpp: apply #3586 git-svn-id: http://svn.osgeo.org/qgis/trunk@15419
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge remote-tracking branch 'origin/master' into blend_modes
 
-2011-03-10  rblazek 
+Merge: 24fedb2 d1825ec
+Alexandre Neto 	2013-03-27
 
-	* src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h,
-	src/providers/gdal/qgsgdalprovider.cpp: GDALWarpOperation ->
-	GDALRasterIO git-svn-id: http://svn.osgeo.org/qgis/trunk@15418
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge remote-tracking branch 'upstream/master'
 
-2011-03-10  borysiasty 
+Nyall Dawson 	2013-03-28
 
-	* i18n/qgis_pl_PL.ts: translation update:pl git-svn-id: http://svn.osgeo.org/qgis/trunk@15417
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Blend modes for labels and label buffers
 
-2011-03-10  jef 
+Nyall Dawson 	2013-03-28
 
-	* src/core/qgsrasterdataprovider.cpp: fix raster reprojection crash
-	on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15416
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move BlendMode enum and functions to QgsMapRenderer
 
-2011-03-10  macho 
+Merge: dd9bf7e 9aea6ad
+Jürgen Fischer 	2013-03-27
 
-	* src/app/qgisapp.cpp: revert to marcos 0 instead of NULL - sorry
-	for commiting that git-svn-id: http://svn.osgeo.org/qgis/trunk@15415
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #482 from matthias-kuhn/fix-7379
+    
+    Fix issue #7379: Crash when attribute table is closed after layer has be...
 
-2011-03-10  macho 
+Merge: aa6d22a f28f13c
+Jürgen Fischer 	2013-03-27
 
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/legend/qgslegendlayer.cpp, src/app/qgisapp.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgsmaplayer.cpp, src/core/qgsvectorlayer.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: some more
-	cleanup of dupicate includes git-svn-id: http://svn.osgeo.org/qgis/trunk@15414
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #484 from matthias-kuhn/attribute-table-sort
+    
+    Fix #7459: Sorting of attribute table takes type into account
 
-2011-03-10  mhugent 
+Alexander Bruy 	2013-03-27
 
-	* src/app/qgisapp.cpp: Fix for compilation git-svn-id: http://svn.osgeo.org/qgis/trunk@15413
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    put Topology Checker plugin into Vector menu
 
-2011-03-10  wonder 
+edigonzales 	2013-03-27
 
-	* src/ui/qgisapp.ui: Removed windowTitle since for some reason it
-	caused crashes on Mac git-svn-id: http://svn.osgeo.org/qgis/trunk@15412
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    working on referer option for http requests
 
-2011-03-10  borysiasty 
+Merge: 0005467 429be1e
+mhugent 	2013-03-27
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@15411
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #483 from matthias-kuhn/pie-angle
+    
+    Add start angle offset for pie diagram
 
-2011-03-10  telwertowski 
+Matthias Kuhn 	2013-03-27
 
-	* src/app/main.cpp, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/core/qgsapplication.cpp, src/core/qgsapplication.h: Use
-	QFileOpenEvent to handle double clicking a file icon in the Mac OS X
-	Finder. This works for both Cocoa and Carbon. Remove Carbon-only
-	OpenDocument code.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15410
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #7459: Sorting of attribute table takes type into account
 
-2011-03-09  rblazek 
+Marco Hugentobler 	2013-03-27
 
-	* src/providers/gdal/qgsgdalprovider.cpp: temporary? ugly fix for
-	not georeferenced images git-svn-id: http://svn.osgeo.org/qgis/trunk@15409
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Complete data defined symbology for simple line symbol layer
 
-2011-03-09  jef 
+Matthias Kuhn 	2013-03-27
 
-	* python/core/qgscoordinatereferencesystem.sip: add
-	QgsCoordinateReferenceSystem::authid() to python bindings git-svn-id: http://svn.osgeo.org/qgis/trunk@15408
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add start angle offset for pie diagram
 
-2011-03-09  jef 
+Matthias Kuhn 	2013-03-27
 
-	* i18n/qgis_de.ts, src/providers/gdal/qgsgdalprovider.cpp: 
-	translation string fixes and german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15407
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix issue #7379: Crash when attribute table is closed after layer has been deleted
 
-2011-03-09  jef 
+Merge: 24f1519 689c940
+Nathan Woodrow 	2013-03-27
 
-	* src/app/qgsabout.cpp, src/app/qgsbookmarks.cpp,
-	src/app/qgsclipboard.cpp, src/app/qgscustomprojectiondialog.cpp,
-	src/app/qgspluginmanager.cpp, src/app/qgsprojectproperties.cpp,
-	src/app/qgsquerybuilder.cpp, src/app/qgsrasterlayerproperties.cpp,
-	src/core/qgscoordinatetransform.cpp, src/core/qgsgeometry.cpp,
-	src/core/qgshttptransaction.cpp, src/core/qgsmaplayer.cpp,
-	src/core/qgspallabeling.cpp, src/core/qgsproject.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/symbology/qgssymbol.cpp,
-	src/gui/qgsprojectionselector.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/spit/qgsshapefile.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: remove duplicate inclusion of
-	qgslogger.h (probably introduced with r9138) git-svn-id: http://svn.osgeo.org/qgis/trunk@15406
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #481 from matthias-kuhn/fix-missing-icons
+    
+    Fix missing icons (Removed in rebase)
 
-2011-03-09  macho 
+Matthias Kuhn 	2013-03-27
 
-	* i18n/qgis_de.ts: translation update: german git-svn-id: http://svn.osgeo.org/qgis/trunk@15405
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix missing icons (Removed in rebase)
 
-2011-03-09  borysiasty 
+Marco Hugentobler 	2013-03-27
 
-	* i18n/qgis_pl_PL.ts: pl translation update by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15404
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve data defined dialog, consider data defined color for single line symbol layer
 
-2011-03-09  macho 
+Juergen E. Fischer 	2013-03-27
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts,
-	i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: the next big string update
-	after raster merge and app.ui change git-svn-id: http://svn.osgeo.org/qgis/trunk@15403
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  pcav 
-
-	* src/plugins/grass/modules-common/v.distance.qgm,
-	src/plugins/grass/modules-common/v.generalize.qgm: Improved
-	v.distance and v.generalize GRASS modules git-svn-id: http://svn.osgeo.org/qgis/trunk@15402
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  borysiasty 
-
-	* src/app/qgisapp.cpp: patch #3354 by John Donovan git-svn-id: http://svn.osgeo.org/qgis/trunk@15401
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  pcav 
-
-	* qgis.1: Updated manpage git-svn-id: http://svn.osgeo.org/qgis/trunk@15400
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  macho 
-
-	* i18n/qgis_ja.ts: translation update: another update for .ja by
-	Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@15399
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  macho 
-
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@15398
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  rblazek 
-
-	* src/core/raster/qgsrasterlayer.cpp: stretch to current extent with
-	reprojection fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15397
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-09  rblazek 
-
-	* src/core/qgsrasterprojector.cpp: less debug output git-svn-id: http://svn.osgeo.org/qgis/trunk@15396
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  jef 
-
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h: fix #3542 git-svn-id: http://svn.osgeo.org/qgis/trunk@15395
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  jef 
-
-	* debian/changelog, debian/qgis-providers.install: debian packaging
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@15394
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  jef 
-
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h, src/core/qgsrasterprojector.cpp,
-	src/core/qgsrasterprojector.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrasterviewport.h,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: fix a few warnings and
-	indentation git-svn-id: http://svn.osgeo.org/qgis/trunk@15393
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  rblazek 
-
-	* python/core/qgscoordinatetransform.sip,
-	python/core/qgsrasterviewport.sip,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h, src/core/CMakeLists.txt,
-	src/core/qgscoordinatetransform.h,
-	src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h, src/core/qgsrasterprojector.cpp,
-	src/core/qgsrasterprojector.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrasterviewport.h, src/providers/CMakeLists.txt,
-	src/providers/gdal/CMakeLists.txt,
-	src/providers/gdal/qgsgdalprovider.cpp,
-	src/providers/gdal/qgsgdalprovider.h,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h,
-	src/providers/wms/CMakeLists.txt,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: merged raster-providers branch
-	r15390 git-svn-id: http://svn.osgeo.org/qgis/trunk@15392
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  jef 
-
-	* i18n/qgis_de.ts,
-	src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp,
-	src/ui/qgisapp.ui, src/ui/qgsoptionsbase.ui: some string fixes and
-	german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15391
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  mhugent 
-
-	* python/core/qgsvectorlayer.sip,
-	src/app/qgsgraduatedsymboldialog.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Fix
-	graduated classifications for joined fields git-svn-id: http://svn.osgeo.org/qgis/trunk@15389
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  mhugent 
-
-	* src/providers/ogr/qgsogrprovider.cpp: Saver attribute map handling
-	(no insertion of additional entry if a column does not exist) git-svn-id: http://svn.osgeo.org/qgis/trunk@15388
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  wonder 
-
-	* src/app/qgisapp.cpp: Fix r15383 on Mac.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15387
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  jef 
-
-	* src/core/qgsproject.h: fix doxygen warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15386
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-08  cfarmer 
-
-	* python/plugins/fTools/tools/doGeoprocessing.py: dummy commit to
-	reflect changes to address #3148: writing output with conflicting
-	field names now handled gracefully by writer (or caught ahead of
-	time by fTools) git-svn-id: http://svn.osgeo.org/qgis/trunk@15385
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  cfarmer 
-
-	* doc/CONTRIBUTORS, python/plugins/fTools/CMakeLists.txt,
-	python/plugins/fTools/__init__.py,
-	python/plugins/fTools/doAbout.py, python/plugins/fTools/fTools.py,
-	python/plugins/fTools/frmAbout.ui,
-	python/plugins/fTools/ftools_help.xml,
-	python/plugins/fTools/ftools_help.xsl,
-	python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doIntersectLines.py,
-	python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doMeanCoords.py,
-	python/plugins/fTools/tools/doPointDistance.py,
-	python/plugins/fTools/tools/doPointsInPolygon.py,
-	python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/doRandom.py,
-	python/plugins/fTools/tools/doReProject.py,
-	python/plugins/fTools/tools/doRegPoints.py,
-	python/plugins/fTools/tools/doSelectByLocation.py,
-	python/plugins/fTools/tools/doSimplify.py,
-	python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/doSubsetSelect.py,
-	python/plugins/fTools/tools/doSumLines.py,
-	python/plugins/fTools/tools/doValidate.py,
-	python/plugins/fTools/tools/doVectorGrid.py,
-	python/plugins/fTools/tools/doVectorSplit.py,
-	python/plugins/fTools/tools/doVisual.py,
-	python/plugins/fTools/tools/frmJoinAttributes.ui: 
-	python/plugins/fTools/tools/doJoinAttributes.py
-	python/plugins/fTools/tools/frmJoinAttributes.ui
-	python/plugins/fTools/tools/doReProject.py
-	python/plugins/fTools/tools/frmReProject.ui
-	python/plugins/fTools/ftools_help.xsl
-	python/plugins/fTools/doAbout.py python/plugins/fTools/frmAbout.ui
-	python/plugins/fTools/__init__.py
-	python/plugins/fTools/CMakeLists.txt python/plugins/fTools/fTools.py
-	python/plugins/fTools/ftools_help.xml git-svn-id: http://svn.osgeo.org/qgis/trunk@15384
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  wonder 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgisappinterface.cpp, src/app/qgsshortcutsmanager.cpp,
-	src/app/qgsshortcutsmanager.h, src/ui/qgisapp.ui,
-	src/ui/qgisappbase.ui: Moved creation of actions, menus and toolbars
-	to UI file git-svn-id: http://svn.osgeo.org/qgis/trunk@15383
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  jef 
-
-	* resources/context_help/QgsFieldCalculator-de_DE,
-	resources/context_help/QgsFieldCalculator-en_US: add online help for
-	r15381 git-svn-id: http://svn.osgeo.org/qgis/trunk@15382
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  jef 
-
-	* python/core/qgsdistancearea.sip, src/app/qgsfieldcalculator.cpp,
-	src/core/qgsdistancearea.cpp, src/core/qgsdistancearea.h,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: [FEATURE] add $x, $y and $perimeter to
-	field calculator git-svn-id: http://svn.osgeo.org/qgis/trunk@15381
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  jef 
-
-	* src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp: fix #1308 git-svn-id: http://svn.osgeo.org/qgis/trunk@15380
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  jef 
-
-	* cmake_templates/qgsconfig.h.in, src/app/qgisapp.cpp: - use online API documentation, when no local is found - remove "set layer CRS" from toolbar git-svn-id: http://svn.osgeo.org/qgis/trunk@15378
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  timlinux 
-
-	* src/app/qgssinglesymboldialog.cpp,
-	src/gui/symbology-ng/qgsbrushstylecombobox.cpp,
-	src/gui/symbology-ng/qgspenstylecombobox.cpp: Applied patch from
-	JCTull - show no pen and no fill as second entry in lists for
-	symbology. Thanks. Closes #3557 git-svn-id: http://svn.osgeo.org/qgis/trunk@15377
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-07  kyngchaos 
-
-	* src/app/qgssinglesymboldialog.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp: Use Qt color
-	picker to avoid Qt Cocoa crashes (#3497), part 1 git-svn-id: http://svn.osgeo.org/qgis/trunk@15376
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-06  jef 
-
-	* cmake/Txt2Tags.cmake, doc/CMakeLists.txt: txt2tags should have
-	been optional git-svn-id: http://svn.osgeo.org/qgis/trunk@15375
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-06  borysiasty 
-
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/ui/qgsoptionsbase.ui: FEATURE: Select
-	default CRS for new projects. Fixes #363 git-svn-id: http://svn.osgeo.org/qgis/trunk@15374
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-06  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts,
-	i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: preparing for next release git-svn-id: http://svn.osgeo.org/qgis/trunk@15372
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2011-03-06  macho 
+Juergen E. Fischer 	2013-03-27
 
-	* src/ui/qgsoptionsbase.ui: typo fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15371
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging update
 
-2011-03-06  alexbruy 
+Juergen E. Fischer 	2013-03-27
 
-	* python/plugins/fTools/tools/doMergeShapes.py,
-	python/plugins/fTools/tools/frmMergeShapes.ui,
-	python/plugins/fTools/tools/ftools_utils.py: add option to select
-	shapefile geometry in merge shapes tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15370
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2011-03-06  borysiasty 
+Matthias Kuhn 	2013-03-27
 
-	* images/images.qrc, src/app/qgisapp.cpp: fix r15352 git-svn-id: http://svn.osgeo.org/qgis/trunk@15365
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add some GUI strings for the Expression Builder Dialog
 
-2011-03-06  wonder 
+Matthias Kuhn 	2013-03-27
 
-	* src/core/qgslogger.cpp, src/core/qgslogger.h: Logger updates: - evaluate QGIS_DEBUG environment variable just once - QgsDebugMsgLevel macro will evaluate the passed string only when
-	it will really print it.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15364
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set custom feature form visible in dual view
 
-2011-03-06  macho 
+Matthias Kuhn 	2013-03-27
 
-	* i18n/qgis_es.ts, i18n/qgis_fr.ts: translation update: es by carlos
-	and fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@15363
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix sip problems / export gui classes to libraries
 
-2011-03-06  timlinux 
+Matthias Kuhn 	2013-03-26
 
-	* src/app/qgstipfactory.cpp: Added 'sponsor us' tip git-svn-id: http://svn.osgeo.org/qgis/trunk@15362
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix rebase problems
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-03-11
 
-	* src/core/qgscoordinatereferencesystem.cpp: be less restrictive on
-	interpreting CRSes git-svn-id: http://svn.osgeo.org/qgis/trunk@15361
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Attribute table: Mark current edited in red so user is aware of autocommitted changes.
+    Quick fix.
+    The better approach would be to only change the color after changes have been made by the user
 
-2011-03-06  timlinux 
+Matthias Kuhn 	2013-02-20
 
-	* src/app/qgsoptions.cpp, src/app/qgsoptions.h,
-	src/ui/qgsoptionsbase.ui: For global crs option show nice user
-	friendly name instead of proj4 string git-svn-id: http://svn.osgeo.org/qgis/trunk@15360
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix: Check for existence of data provider to prevent segfault
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-02-20
 
-	* src/app/legend/qgslegend.cpp: fix r15352 git-svn-id: http://svn.osgeo.org/qgis/trunk@15359
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add tests for QgsVectorLayerCache
 
-2011-03-06  timlinux 
+Matthias Kuhn 	2013-02-20
 
-	* src/app/qgstipfactory.cpp: Added tip relating to the use of
-	default on the fly reprojection git-svn-id: http://svn.osgeo.org/qgis/trunk@15358
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove unneeded variable
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-02-20
 
-	* debian/control, debian/control.sid, debian/qgis-api-doc.install,
-	debian/qgis-apidoc.dirs, debian/qgis-common.install: debian
-	packaging fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15357
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix issue #7169
+    If removing multiple attributes, remove the indices in descending order, so it does not get confused
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-02-20
 
-	* doc/AUTHORS, doc/AUTHORS.t2t, doc/CMakeLists.txt,
-	doc/CONTRIBUTORS, doc/CONTRIBUTORS.t2t, doc/DONORS, doc/DONORS.t2t,
-	doc/SPONSORS, doc/SPONSORS.t2t, doc/TRANSLATORS,
-	doc/TRANSLATORS.t2t: restore documentation used in about box git-svn-id: http://svn.osgeo.org/qgis/trunk@15356
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add tests for attribute table / dual view
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-02-20
 
-	* i18n/qgis_de.ts, src/plugins/roadgraph/shortestpathwidget.cpp: 
-	german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15355
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Major redesign of attribute table, codename: dual view
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-03-11
 
-	* src/providers/ogr/qgsogrprovider.cpp: ogr provider: use utf8 also
-	for SQL statements with GDAL 1.8 git-svn-id: http://svn.osgeo.org/qgis/trunk@15354
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add indexable vector layer cache
 
-2011-03-06  jef 
+Matthias Kuhn 	2013-01-28
 
-	* src/app/CMakeLists.txt, src/app/qgshandlebadlayers.cpp,
-	src/app/qgshandlebadlayers.h, src/ui/qgshandlebadlayersbase.ui: 
-	[FEATURE] allow managing missing layers in a list git-svn-id: http://svn.osgeo.org/qgis/trunk@15353
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add a select by expression dialog.
+    Allow to change the current selection based on a QgsExpression
+    * Select (clear and select)
+    * Add to selection
+    * Remove from selection
+    * Select within selection (Intersect)
 
-2011-03-06  jef 
+Werner Macho 	2013-03-27
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/legend/qgslegendlayer.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h: [FEATURE] allow setting CRS for multiple layers
-	at once git-svn-id: http://svn.osgeo.org/qgis/trunk@15352
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    deleted fixed Version in html
+    
+    fixed Version is obsolete
 
-2011-03-06  borysiasty 
+Merge: 86a246a 4435c4f
+Nyall Dawson 	2013-03-27
 
-	* doc/AUTHORS.t2t: email address update git-svn-id: http://svn.osgeo.org/qgis/trunk@15351
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix branch to apply to current master
 
-2011-03-06  jef 
+Minoru Akagi 	2013-03-05
 
-	* debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.natty, debian/control.sid,
-	debian/control.squeeze, debian/docs, debian/qgis-apidoc.dirs,
-	debian/qgis-common.install, debian/rules: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15350
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    refresh field names after all layers loaded and encoding change (fix #6840)
 
-2011-03-06  jef 
+Minoru Akagi 	2013-03-05
 
-	* doc/AUTHORS.t2t, doc/CONTRIBUTORS.t2t, doc/DONORS.t2t,
-	doc/SPONSORS.t2t, doc/TRANSLATORS.t2t, doc/iauthors.t2t: missed
-	added files in r15348.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15349
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix table join (fix #7068)
 
-2011-03-06  jef 
+Juergen E. Fischer 	2013-03-27
 
-	* AUTHORS, CMakeLists.txt, CONTRIBUTORS, DONORS, SPONSORS,
-	TRANSLATORS, cmake/Txt2Tags.cmake, cmake_templates/Doxyfile.in,
-	cmake_templates/qgsconfig.h.in, doc/CMakeLists.txt,
-	doc/INSTALL.t2t, doc/authors.t2t: [FEATURE] documentation
-	improvements replace AUTHORS, CONTRIBUTORS, DONORS, SPONSORS and
-	TRANSLATOR with t2t version in doc, run txt2tags within the build
-	and install documentation.  Optionally build and install api
-	documentation git-svn-id: http://svn.osgeo.org/qgis/trunk@15348
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2011-03-05  mhugent 
+Victor Olaya 	2013-03-27
 
-	* src/providers/postgres/qgspostgresprovider.cpp: More robust
-	detection for domain constraint git-svn-id: http://svn.osgeo.org/qgis/trunk@15347
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] changed version number (wasn't changed since last release) and min required qgis version
 
-2011-03-05  jef 
+Victor Olaya 	2013-03-27
 
-	* python/core/qgsmaplayer.sip,
-	src/analysis/vector/qgsgeometryanalyzer.cpp,
-	src/analysis/vector/qgsoverlayanalyzer.cpp,
-	src/app/qgsmaptoolidentify.cpp, src/core/qgsmaplayer.h,
-	src/core/qgsmaprenderer.cpp, src/core/qgspallabeling.cpp,
-	src/core/qgsproject.cpp, src/core/qgsvectorfilewriter.cpp,
-	src/core/qgsvectorlayer.h, src/core/raster/qgsrasterlayer.cpp,
-	src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsprojectparser.cpp, src/mapserver/qgssldparser.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp: 
-	deprecate QgsMapLayer::srs() git-svn-id: http://svn.osgeo.org/qgis/trunk@15346
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] changed how saga installation test is performed (now it uses the test data)
 
-2011-03-05  timlinux 
+Victor Olaya 	2013-03-27
 
-	* src/app/qgsoptions.cpp, src/app/qgsoptions.h: Show more user
-	friendly projection name for qgis default project CRS (relates to
-	#393) git-svn-id: http://svn.osgeo.org/qgis/trunk@15345
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] more tests
 
-2011-03-05  timlinux 
+Juergen E. Fischer 	2013-03-26
 
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/ui/qgsoptionsbase.ui: Applied patch for
-	#363 from Alex Bruy to enable on the fly projection by default.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15344
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    topology plugin:
+    - cleanups & fixes for warnings
+    - log messages
+    - translation strings
+    - return plugin category (fixes persistent loading)
 
-2011-03-05  jef 
+Merge: 4e29436 8bf6df2
+Nyall Dawson 	2013-03-27
 
-	* debian/changelog: fix debian/changelog git-svn-id: http://svn.osgeo.org/qgis/trunk@15343
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge remote-tracking branch 'origin/master' into hue_saturation
 
-2011-03-05  brushtyler 
+vinayan 	2013-02-26
 
-	* python/plugins/GdalTools/tools/doGrid.py: fix #3450 git-svn-id: http://svn.osgeo.org/qgis/trunk@15342
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    rule table now prevents duplicate entries
 
-2011-03-05  borysiasty 
+vinayan 	2013-02-25
 
-	* python/plugins/fTools/tools/frmRandPoints.ui: revert r15340 as it
-	doesn't solve anything git-svn-id: http://svn.osgeo.org/qgis/trunk@15341
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    layer comboboxes display proper layers as per topologyrule
 
-2011-03-05  borysiasty 
+vinayan 	2013-02-17
 
-	* python/plugins/fTools/tools/frmRandPoints.ui: fix #3362 git-svn-id: http://svn.osgeo.org/qgis/trunk@15340
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix gaps,overlaps for invalid goemetry errors by skipping
 
-2011-03-05  borysiasty 
+vinayan 	2012-12-12
 
-	* src/plugins/spit/qgsspit.cpp: fix #3311 git-svn-id: http://svn.osgeo.org/qgis/trunk@15339
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Feature] Topology Cheker Plugin.
+    added files for topology plugin
+    
+    modified cmakelists to add topology plugin folder
+    
+    Conflicts:
+    
+src/plugins/CMakeLists.txt           
+    
+    fixed issues in duplicate rule where zooming was not possible..renamed 'Test' to 'Rule'
+    
+    fixed minimum segment length rule
+    renamed rules to meaningful descriptions
+    
+    Added new rule "Must not have pseudos" for line vector layers.
+    Renamed rules to more understandable descriptions.
+    Handled WKB::MultilineStrings in line shapefiles in hanging lines rule that caused crashes.
+    
+    "segments must have minimum length" rule now only checks if the geometry contains at least one short segment
+    
+    added new Rule "Must Not Have Gaps"
+    removed unwanted indexing for some rules.
+    prepare commit run.
+    
+    test commit
+    
+    modified 'must not have gaps' rule.
+    
+    updated calls to new vector api
+    
+    more changes based on new api
+    
+    fixed "must not have gaps rule"
+    fixed extent issues
+    
+    changed dangle rule implementation
+    
+    More rules added
+    -checkPointCoveredbyLineEnds
+    -checkPointInPolygon
+    
+    new rules added
+    -point must be inside polygon
+    -polygon must contain point
+    -geometry must not be multipart
+    
+    added rule 'checkyLineEndsCoveredByPoints'
+    renamed some rules
+    commented 'closer than tolerance rules' -performance issues
+    changed colors of error markers
+    
+    changed visualization style of errors
+    
+    changed rule paramters
+    validateExtent fixed to show only errors from within canvas extent
+    removed rule - polygons must contain feature
+    removed direct calls to geos api
+    prepare commit run
+    
+    fixed missing icon in plugin manager
+    
+    icons added. validateSelected option removed
 
-2011-03-05  jef 
+Alexander Bruy 	2013-03-19
 
-	* debian/changelog, debian/qgis.install: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15336
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    UI to control brightness and contrast values in raster properties,
+    attempt to fix contrast calculation
 
-2011-03-05  timlinux 
+Radim Blazek 	2013-03-26
 
-	* src/app/qgisapp.cpp: Cleanup some about text as suggested by users
-	at the last hackfest git-svn-id: http://svn.osgeo.org/qgis/trunk@15335
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend styles fix
 
-2011-03-05  stopa85 
+Radim Blazek 	2013-03-26
 
-	* src/plugins/roadgraph/roadgraphplugin.cpp: fix: road graph not
-	clean GUI when unload git-svn-id: http://svn.osgeo.org/qgis/trunk@15334
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend styles, fixes partialy #6960
 
-2011-03-04  timlinux 
+Merge: 250cc4e a482c42
+Jürgen Fischer 	2013-03-26
 
-	* src/gui/qgsprojectbadlayerguihandler.cpp: Better wording for the
-	load missing layers dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15333
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #473 from Oslandia/atlas
+    
+    Atlas: fix #7408
 
-2011-03-04  timlinux 
+Marco Hugentobler 	2013-03-26
 
-	* src/app/legend/qgslegend.cpp,
-	src/gui/qgsprojectbadlayerguihandler.cpp,
-	src/gui/qgsprojectbadlayerguihandler.h: Partial fix for loading
-	projects with missing layers from Sunilraj at KCube. see #3468 git-svn-id: http://svn.osgeo.org/qgis/trunk@15332
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add dialog for data defined symbology
 
-2011-03-04  timlinux 
+Juergen E. Fischer 	2013-03-26
 
-	* src/plugins/CMakeLists.txt,
-	src/plugins/ogr_converter/CMakeLists.txt,
-	src/plugins/ogr_converter/README,
-	src/plugins/ogr_converter/dialog.cpp,
-	src/plugins/ogr_converter/dialog.h,
-	src/plugins/ogr_converter/format.cpp,
-	src/plugins/ogr_converter/format.h,
-	src/plugins/ogr_converter/ogrconverter.qrc,
-	src/plugins/ogr_converter/ogrconverterguibase.ui,
-	src/plugins/ogr_converter/plugin.cpp,
-	src/plugins/ogr_converter/plugin.h,
-	src/plugins/ogr_converter/translator.cpp,
-	src/plugins/ogr_converter/translator.h: Removed ogr converter: 1.
-	its not maintained 2. its mostly duplicated by the layer save as...
-	option.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15331
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2011-03-04  stopa85 
+nyalldawson 	2013-03-26
 
-	* src/plugins/roadgraph/CMakeLists.txt,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: Add progress bar.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15330
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix initial state of saturation controls
 
-2011-03-04  jef 
+nyalldawson 	2013-03-26
 
-	* src/providers/ogr/qgsogrprovider.cpp: fix #3542 git-svn-id: http://svn.osgeo.org/qgis/trunk@15329
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add strength slider for raster colorization
 
-2011-03-04  pcav 
+Nyall Dawson 	2013-03-26
 
-	* i18n/qgis_it.ts: Updates to IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15328
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add colorize control for raster layers
 
-2011-03-03  wonder 
+Nyall Dawson 	2013-03-26
 
-	* python/core/qgsvectorlayer.sip, src/core/qgsvectorlayer.h: Added
-	missing python bindings for table joins git-svn-id: http://svn.osgeo.org/qgis/trunk@15327
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Option to convert a raster to grayscale with choice of desaturation mode (lightness, luminosity, average) (fix #5837)
 
-2011-03-03  wonder 
+Nyall Dawson 	2013-03-25
 
-	* src/app/qgsoptions.cpp, src/app/qgsoptions.h: Also enable
-	antialiasing with QPixmap in options dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15325
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add saturation control for raster images
 
-2011-03-03  wonder 
+Larry Shaffer 	2013-03-25
 
-	* src/gui/qgsmapcanvasmap.cpp: Rendering to QPixmap supports
-	antialiasing nowadays git-svn-id: http://svn.osgeo.org/qgis/trunk@15324
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove interior button focus color for QgsColorButton wells
+    
+    - Focus color tinted button's set color on platforms like Ubuntu
+    - Border should be updated with OS-style focus color when button in focus (currently no focus hint)
 
-2011-03-03  kyngchaos 
+Larry Shaffer 	2013-03-23
 
-	* src/app/composer/qgscomposerlabelwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposermapwidget.cpp,
-	src/app/composer/qgscomposerscalebarwidget.cpp,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/app/qgslabeldialog.cpp, src/app/qgslabelinggui.cpp,
-	src/app/qgslabelpropertydialog.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.cpp: use Qt font dialog for Qt Cocoa git-svn-id: http://svn.osgeo.org/qgis/trunk@15323
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update Project Properties dialog with vertical tabs and update ui
+    
+    - Dialog now subclassed from new class QgsOptionsDialogBase
+    - Add collapsible group boxes where applicable
+    - Update Projection Selector ui to work in outlying cases
+    - Switch Opacity default for styles to Transparency
 
-2011-03-03  alexbruy 
+Victor Olaya 	2013-03-26
 
-	* python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/doMergeShapes.py: use crs() instead of
-	deprecated srs() git-svn-id: http://svn.osgeo.org/qgis/trunk@15322
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] more testing stuff and a couple of minor fixes
 
-2011-03-03  mhugent 
+Alexander Bruy 	2013-03-25
 
-	* README: Changed gpl2->gpl3 in readme because of gpl3 parts in the
-	QGIS sources git-svn-id: http://svn.osgeo.org/qgis/trunk@15321
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    missed file
 
-2011-03-03  alexbruy 
+Radim Blazek 	2013-03-25
 
-	* python/plugins/fTools/tools/ftools_utils.py: get uniquie values
-	from provider instead of using own function git-svn-id: http://svn.osgeo.org/qgis/trunk@15320
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    missing QPen header compilation fix
 
-2011-03-03  alexbruy 
+Alexander Bruy 	2013-03-25
 
-	* python/plugins/fTools/doAbout.py: display correct fTools version
-	in About dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15319
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add SEXTANTE test data to build
 
-2011-03-03  macho 
+Victor Olaya 	2013-03-25
 
-	* i18n/qgis_sv.ts: translation update: sv by emj git-svn-id: http://svn.osgeo.org/qgis/trunk@15318
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] more improvements in automated tests tools and some cleaning
 
-2011-03-03  jef 
+Juergen E. Fischer 	2013-03-24
 
-	* src/app/qgshighlight.cpp: fix r15315 git-svn-id: http://svn.osgeo.org/qgis/trunk@15317
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2011-03-03  jef 
+Tim Sutton 	2013-03-24
 
-	* debian/changelog, debian/control, debian/control.hardy,
-	debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.natty, debian/control.sid,
-	debian/control.squeeze, debian/qgis.install: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15316
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Removed compiler warning
 
-2011-03-03  jef 
+Tim Sutton 	2013-03-24
 
-	* src/app/CMakeLists.txt, src/app/qgsattributedialog.cpp,
-	src/app/qgsattributedialog.h, src/app/qgsfeatureaction.cpp,
-	src/app/qgsfeatureaction.h, src/app/qgshighlight.cpp,
-	src/app/qgshighlight.h, src/app/qgsidentifyresults.cpp,
-	src/app/qgsidentifyresults.h, src/core/qgspoint.h,
-	src/gui/qgsmapcanvas.h: fix #926 git-svn-id: http://svn.osgeo.org/qgis/trunk@15315
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix compilation errors for grass provider
 
-2011-03-03  jef 
+Victor Olaya 	2013-03-24
 
-	* src/plugins/spatialquery/qgsspatialquerydialog.cpp: fix
-	deprecation warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15314
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] minor corrections in test tools
 
-2011-03-02  timlinux 
+Victor Olaya 	2013-03-24
 
-	* src/plugins/CMakeLists.txt,
-	src/plugins/quick_print/CMakeLists.txt,
-	src/plugins/quick_print/quickprint.qrc,
-	src/plugins/quick_print/quickprintgui.cpp,
-	src/plugins/quick_print/quickprintgui.h,
-	src/plugins/quick_print/quickprintguibase.ui,
-	src/plugins/quick_print/quickprintplugin.cpp,
-	src/plugins/quick_print/quickprintplugin.h: Removed quick print
-	plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@15313
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sexante] change how temp files are deleted when exiting sextante
 
-2011-03-02  mhugent 
-
-	* src/plugins/sqlanywhere/saquerybuilder.cpp: unique values from
-	layer also for sqlanywhere git-svn-id: http://svn.osgeo.org/qgis/trunk@15312
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-24
 
-2011-03-02  mhugent 
-
-	* src/app/qgsquerybuilder.cpp, src/app/qgsuniquevaluedialog.cpp: Use
-	layer method for unique values in query builder and old symbology git-svn-id: http://svn.osgeo.org/qgis/trunk@15311
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-02  mhugent 
-
-	* python/core/qgsvectorlayer.sip, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/qgsvectorlayerjoinbuffer.h,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp: Add
-	uniqueValues() method for vector layer. Fixes #3528 git-svn-id: http://svn.osgeo.org/qgis/trunk@15310
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-03-02  timlinux 
+    [sextante] Modified test data and example models
 
-	* : Use transparent png rather git-svn-id: http://svn.osgeo.org/qgis/trunk@15309
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-24
 
-2011-03-02  timlinux 
+    Add export macro
 
-	* src/app/qgstipfactory.cpp: Center image in tip git-svn-id: http://svn.osgeo.org/qgis/trunk@15308
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 920036e 56b55a0
+Marco Hugentobler 	2013-03-24
 
-2011-03-02  timlinux 
+    Merge composer ruler branch
 
-	* images/images.qrc, src/app/qgstipfactory.cpp: Added new images
-	folder for tip images and new tip from Alister Hood which
-	demonstrates how to add a tip with an image. Note the use of alias
-	in the qrc file.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15307
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-24
 
-2011-03-02  jef 
+    Fix ruler shift
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.h,
-	src/app/qgsoptions.cpp, src/ui/qgsoptionsbase.ui: implement #3535 git-svn-id: http://svn.osgeo.org/qgis/trunk@15306
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: dac35e1 adf8c26
+Werner Macho 	2013-03-24
 
-2011-03-01  mhugent 
+    Merge pull request #478 from tomass/master
+    
+    Remove russian words from lithuanian translation
 
-	* src/providers/spatialite/qgsspatialiteprovider.cpp: Fix crash in
-	ticket #3528 git-svn-id: http://svn.osgeo.org/qgis/trunk@15305
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tomas 	2013-03-24
 
-2011-03-01  cfarmer 
+    Remove russian words from lithuanian translation
 
-	* python/plugins/fTools/__init__.py: update version number again git-svn-id: http://svn.osgeo.org/qgis/trunk@15304
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 176a08c 08fba25
+Nathan Woodrow 	2013-03-23
 
-2011-03-01  jef 
+    Merge pull request #476 from nyalldawson/blend_modes
+    
+    Blend modes pt 2
 
-	* src/app/qgsmanageconnectionsdialog.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsrasterlayerproperties.cpp, src/app/qgstipgui.cpp,
-	src/app/qgswmssourceselect.cpp,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: automatic
-	indentation update (r15222-r15302) git-svn-id: http://svn.osgeo.org/qgis/trunk@15303
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-23
 
-2011-03-01  timlinux 
+    [sextante]improved classes for creating unit tests from GUI
 
-	* src/plugins/spatialquery/CMakeLists.txt,
-	src/plugins/spatialquery/README,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.qrc,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h: Applied latest
-	spatialquery_X_full.zip patch from Luiz Motta from #2634. This adds
-	a number of improvements in functionality and usability to the
-	spatial query tool. Muito Obrigado Luiz.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15302
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-23
 
-2011-03-01  timlinux 
+    [sextante]fixed somes issues in ftools algorithms due to changes in vector API
 
-	* src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: Updates from
-	Luiz for spatial query plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@15301
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-23
 
-2011-03-01  timlinux 
+    [sextante] made temporary filenames more descriptive and readable, reusing the original filename but using a temp folder
 
-	* src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.qrc,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: Updates from
-	Luiz for spatial query plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@15300
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-23
 
-2011-03-01  jef 
+    [sextante] added file filters to input boxes in batch processing dialog
 
-	* src/helpviewer/main.cpp: fix help viewer on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15299
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-22
 
-2011-03-01  macho 
+    [sextante]Improvements in error messages in barch processing interface
 
-	* i18n/qgis_fr.ts: translation update: fr by Jean Roc git-svn-id: http://svn.osgeo.org/qgis/trunk@15298
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-24
 
-2011-02-28  jef 
+    Fix for labels incorrectly rendering when blend modes used
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15297
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-23
 
-2011-02-28  jef 
+    issue warning to message log when active iterator is closed when replaced
 
-	* CMakeLists.txt: missed a file in r15294 git-svn-id: http://svn.osgeo.org/qgis/trunk@15296
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-23
 
-2011-02-28  jef 
+    Make QgsBlendModeComboBox extend QComboBox
 
-	* debian/changelog, debian/qgis.install, debian/rules: debian
-	packaging: qgis_help moved to libexec git-svn-id: http://svn.osgeo.org/qgis/trunk@15295
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-23
 
-2011-02-28  jef 
+    Load and save custom snap lines in composer
 
-	* qgis_help.1, src/helpviewer/CMakeLists.txt,
-	src/helpviewer/main.cpp: move qgis_help to libexec git-svn-id: http://svn.osgeo.org/qgis/trunk@15294
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2a9d016 d6ad6e5
+Werner Macho 	2013-03-23
 
-2011-02-28  jef 
+    Merge pull request #477 from matthias-kuhn/pg-msg
+    
+    Small string change: More verbose message in pg source select
 
-	* python/core/qgsapplication.sip, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgshelpviewer.cpp,
-	src/app/qgshelpviewer.h, src/core/qgsapplication.cpp,
-	src/core/qgsapplication.h: cleanup: remove
-	QgsApplication::msexportAppPath() and app/qgshelpviewer* git-svn-id: http://svn.osgeo.org/qgis/trunk@15293
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-03-23
 
-2011-02-28  cfarmer 
+    More verbose message in pg source select
 
-	* python/plugins/fTools/tools/doMeanCoords.py: removes symbology
-	which may cause problems with new/old symbology git-svn-id: http://svn.osgeo.org/qgis/trunk@15292
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-23
 
-2011-02-28  cfarmer 
+    Add support for copy/pasting blend modes for layers
 
-	* python/plugins/fTools/__init__.py: Increases QGIS minimum version,
-	and increases fTools version git-svn-id: http://svn.osgeo.org/qgis/trunk@15291
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a006d99 7423e9a
+Nathan Woodrow 	2013-03-23
 
-2011-02-28  cfarmer 
+    Merge pull request #471 from nyalldawson/heatmap_kernels
+    
+    [FEATURE] Add additional kernels to the Heatmap plugin...
 
-	* python/plugins/fTools/fTools.py,
-	python/plugins/fTools/tools/doGeometry.py: [FEATURE] Adds 'Lines to
-	polygons' tool to fTools. Thanks to Piotr Pociask for the patch.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15290
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-23
 
-2011-02-28  cfarmer 
+    Move blend mode combo box to styles tab
 
-	* python/plugins/fTools/tools/doValidate.py: adds marker at location
-	of geometry errors git-svn-id: http://svn.osgeo.org/qgis/trunk@15289
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-23
 
-2011-02-28  timlinux 
+    Hide custom snap lines before printing composition
 
-	* src/ui/qgsdbsourceselectbase.ui, src/ui/qgspgnewconnectionbase.ui: 
-	Minor re-wording for ease of reading git-svn-id: http://svn.osgeo.org/qgis/trunk@15288
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 0594453 70ef5a7
+Larry Shaffer 	2013-03-22
 
-2011-02-28  jef 
+    Merge pull request #474 from dakcarto/color-button_mk_10
+    
+    [FEATURE] QgsColorButton shows a color chooser dialog on click, checkboard color when translucent, and live updates during color choosing
 
-	* src/app/qgsattributetypedialog.cpp: fix #3534 git-svn-id: http://svn.osgeo.org/qgis/trunk@15287
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-22
 
-2011-02-28  jef 
+    Fix parsing bug in wkb -> geos export
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15286
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-22
 
-2011-02-28  jef 
+    Fix live color updating slot parameter by using SLOT macro
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselectbase.ui: db source select:
-	move 'add' back to the first position in the button box git-svn-id: http://svn.osgeo.org/qgis/trunk@15285
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-22
 
-2011-02-28  jef 
+    Data defined symbology for simple line symbol layer
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h, src/plugins/spit/qgsspit.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	use set application_name (fixes r15280) and verify that
-	pg_is_in_recovery() is false git-svn-id: http://svn.osgeo.org/qgis/trunk@15284
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9afe76d 647fbdb
+Nathan Woodrow 	2013-03-21
 
-2011-02-28  jef 
+    Merge pull request #475 from nyalldawson/blend_modes
+    
+    Add support for blending (composition) modes, eg Overlay, Mutiply, etc (Close #5248)
 
-	* src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.h,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.h,
-	src/ui/qgsdbsourceselectbase.ui: database source select: 'move build
-	query' to button box git-svn-id: http://svn.osgeo.org/qgis/trunk@15283
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-22
 
-2011-02-28  stopa85 
+    Add blend modes widget to raster layer properties dialog
 
-	* src/plugins/roadgraph/linevectorlayerwidget.cpp: update labels in
-	roadgraphplugin settings dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15282
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-22
 
-2011-02-27  jef 
+    Add blend modes widget to vector layer properties dialog
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/ui/qgsdbsourceselectbase.ui: allow switching between geometry
-	and all tables in the selection dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15281
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-22
 
-2011-02-27  jef 
+    New blend modes combo box widget
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/plugins/spit/qgsspit.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: postgres support:
-	include application_name in connections git-svn-id: http://svn.osgeo.org/qgis/trunk@15280
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-22
 
-2011-02-27  jef 
+    Add support for loading and saving blend modes to project files
 
-	* cmake/FindQGIS.cmake: FindQGIS.cmake cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@15278
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-22
 
-2011-02-27  jef 
+    [FEATURE] Add composition blend modes for layers (#5248)
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15277
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-21
 
-2011-02-27  jef 
+    Fix for #7398, allow alpha value change in line pattern fill color picker
+    
+    - Add alpha picker and render support for: line pattern fill, line decoration symbol, font marker symbol
 
-	* src/app/qgstipfactory.cpp: translation string fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15276
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-21
 
-2011-02-27  jef 
+    Fix missing conversion from QgsColorButtonV2 to QgsColorButton
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp: fix runtime
-	warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15275
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-02-28
 
-2011-02-27  jef 
+    housekeeping: remove obsolete code, completely switch to new vector API
 
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h: ogr provider: add support for
-	ignoring fields (adapted from threading branch) git-svn-id: http://svn.osgeo.org/qgis/trunk@15274
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-27  jef 
+Alexander Bruy 	2013-02-28
 
-	* src/core/qgsvectorfilewriter.cpp: fix csv save as support git-svn-id: http://svn.osgeo.org/qgis/trunk@15273
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-27  jef 
-
-	* resources/context_help/MapServerExport-de_DE,
-	resources/context_help/QgsAttributeTableDialog-de_DE,
-	resources/context_help/QgsBookmarks-de_DE,
-	resources/context_help/QgsComposer-de_DE,
-	resources/context_help/QgsCopyrightLabelPluginGui-de_DE,
-	resources/context_help/QgsCustomProjectionDialog-de_DE,
-	resources/context_help/QgsDelimitedTextPluginGui-de_DE,
-	resources/context_help/QgsFieldCalculator-de_DE,
-	resources/context_help/QgsFieldCalculator-en_US,
-	resources/context_help/QgsIdentifyResults-de_DE,
-	resources/context_help/QgsMapserverExport-es_ES,
-	resources/context_help/QgsMapserverExport-pt_BR,
-	resources/context_help/QgsMapserverExport-ru_RU,
-	resources/context_help/QgsMapserverExport-sk_SK,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewHttpConnection-pt_BR,
-	resources/context_help/QgsNewSpatialiteLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNorthArrowPluginGui-de_DE,
-	resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsPgSourceSelect-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-de_DE,
-	resources/context_help/QgsProjectProperties-de_DE,
-	resources/context_help/QgsScaleBarPluginGui-de_DE,
-	resources/context_help/QgsSpatiaLiteSourceSelect-de_DE,
-	resources/context_help/QgsVectorLayerProperties-de_DE,
-	resources/context_help/QgsVectorLayerSaveAsDialog-de_DE,
-	resources/context_help/QgsWMSSourceSelect-de_DE,
-	resources/context_help/SaNewConnection-de_DE: context help update git-svn-id: http://svn.osgeo.org/qgis/trunk@15270
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    review Difference tool
 
-2011-02-27  timlinux 
+Alexander Bruy 	2013-02-28
 
-	* src/app/qgstipfactory.cpp: Added a couple more tips git-svn-id: http://svn.osgeo.org/qgis/trunk@15266
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    review Clip tool
 
-2011-02-25  alexbruy 
+Alexander Bruy 	2013-02-27
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/app/qgsmanageconnectionsdialog.cpp,
-	src/app/qgsmanageconnectionsdialog.h,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/ui/qgsmanageconnectionsdialogbase.ui: manage connections dialog
-	cleanup and usability improvement. Also add support for service
-	parameter in PostgreSQL connection introduced in r15258 git-svn-id: http://svn.osgeo.org/qgis/trunk@15264
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    review and cleanup Convex Hull tool, also move some common routines to
+    utils module and update other algs accordingly
 
-2011-02-25  pcav 
+Alexander Bruy 	2013-02-27
 
-	* i18n/qgis_it.ts: More translation of the IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15263
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    cosmetic chages in QGISAlgorithm provider, also remove unused icons and
+    add new ones to resources
 
-2011-02-25  alexbruy 
+Larry Shaffer 	2013-01-08
 
-	* src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp: remove
-	unnecessary return statement git-svn-id: http://svn.osgeo.org/qgis/trunk@15262
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Update QgsColorButton to offer live color chooser updates and show transparent checkerboard background
+    
+    - Add option to Options for live color chooser support (QgsColorDialog)
+    - Add ability to define whether QgsColorButton accepts live updates (default: true)
+    - Move QgsColorButton to single subclass of QPushButton
+    - Show different button types relative to whether button has text
+    - Add transparent checkerboard background for chosen colors with alpha < 255
+    - Fix triple-modal window issue for Mac (with regards to using native color dialog)
+    
+    - Composer item frame now supports transparency
+    - Composer item background transparency support moved to color dialog
+    - Composer composition grid now supports transparency
 
-2011-02-25  stopa85 
+Matthias Kuhn 	2013-01-08
 
-	* src/plugins/roadgraph/linevectorlayerwidget.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/shortestpathwidget.h: roadgraph GUI update git-svn-id: http://svn.osgeo.org/qgis/trunk@15261
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update core components to use the new QgsColorButton implementation
 
-2011-02-24  mhugent 
+Matthias Kuhn 	2013-01-08
 
-	* src/mapserver/qgsmslayercache.cpp,
-	src/mapserver/qgsmslayercache.h: Higher limit for number of layers
-	in WMS project, use hash instead of map in layer cache git-svn-id: http://svn.osgeo.org/qgis/trunk@15260
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-24  timlinux 
-
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/core/composer/qgscomposermap.cpp, src/core/qgsmaprenderer.cpp,
-	src/core/qgsvectorlayer.cpp: Set the use of symbology ng and anti
-	aliasing to default for qgis 1.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@15259
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-24  jef 
-
-	* python/core/qgsdatasourceuri.sip,
-	src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h,
-	src/ui/qgspgnewconnectionbase.ui: implement #3522 git-svn-id: http://svn.osgeo.org/qgis/trunk@15258
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-24  jef 
-
-	* src/core/qgsmaprenderer.cpp: ouch - missed the real change in
-	r15255 git-svn-id: http://svn.osgeo.org/qgis/trunk@15257
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-24  alexbruy 
-
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/core/raster/qgsrasterlayer.cpp: save default bands combination
-	and stadard deviation. Also use this values when loading new raster
-	layer (fix #3519) git-svn-id: http://svn.osgeo.org/qgis/trunk@15256
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-24  jef 
-
-	* src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvasmap.cpp: skip
-	rendering while size is still 1x1 git-svn-id: http://svn.osgeo.org/qgis/trunk@15255
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-23  brushtyler 
+    Update QgsColorButton so it shows a color chooser on click
 
-	* src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h: fix canvas
-	refresh to avoid crashes git-svn-id: http://svn.osgeo.org/qgis/trunk@15254
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2013-03-21
 
-2011-02-23  rduivenvoorde 
+    refs #7408
+    [Atlas] Add a checkbox on "filter with"
 
-	* i18n/qgis_nl.ts: dutch translations git-svn-id: http://svn.osgeo.org/qgis/trunk@15253
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2013-03-21
 
-2011-02-23  jef 
+    refs #7408
+    Fix error reporting when the filename expression is invalid
 
-	* CMakeLists.txt, src/app/qgsoptions.cpp: fix warning and enable
-	pedantic mode by default git-svn-id: http://svn.osgeo.org/qgis/trunk@15252
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-21
 
-2011-02-23  timlinux 
+    Radio button groups in composer label widget, consider label alignment in adjustSizeToText (important if replacing label text in server)
 
-	* src/app/qgisapp.cpp: Removed message box left in by mistake while
-	testing user defined plugin dirs.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15251
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-20
 
-2011-02-23  timlinux 
+    [sextante] minor code cleaning
 
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/app/qgspluginregistry.cpp,
-	src/app/qgspluginregistry.h, src/ui/qgsoptionsbase.ui: [FEATURE]
-	Added option to load c++ plugins from user specified directories.
-	Requires application restart to activate.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15250
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-20
 
-2011-02-23  jef 
+    [sextante] R scripts can now be run from the script editor
 
-	* src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h: fix canvas
-	refresh git-svn-id: http://svn.osgeo.org/qgis/trunk@15249
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-20
 
-2011-02-23  timlinux 
+    [sextante] temporarily disabled SAGA installation check before running algorithm
 
-	* cmake/FindQGIS.cmake: Added find rule for QGIS git-svn-id: http://svn.osgeo.org/qgis/trunk@15248
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2013-03-20
 
-2011-02-22  jef 
+    Improve error message on collapse due to intersection avoidance
 
-	* i18n/qgis_de.ts, scripts/spelling.dat: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15247
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-03-20
 
-2011-02-22  jef 
+    Added scripts and needed files for making QGIS translatable on transifex.com
 
-	* python/core/qgscoordinatereferencesystem.sip,
-	python/core/qgsdistancearea.sip,
-	src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsmarker.cpp, src/app/qgsprojectproperties.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsdistancearea.cpp, src/core/qgsdistancearea.h,
-	src/gui/CMakeLists.txt, src/gui/qgsgenericprojectionselector.cpp,
-	src/gui/qgsgenericprojectionselector.h,
-	src/gui/qgsprojectionselector.cpp, src/gui/qgsprojectionselector.h,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsepsgcache.cpp,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/providers/memory/qgsmemoryprovider.cpp,
-	src/providers/wfs/qgswfsprovider.cpp,
-	tests/src/core/testqgscoordinatereferencesystem.cpp: deprecated
-	special handling of EPSG - just one authority git-svn-id: http://svn.osgeo.org/qgis/trunk@15246
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-20
 
-2011-02-22  jef 
+    update vector layer sip bindings
 
-	* src/app/qgstipfactory.cpp,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp,
-	src/ui/qgscomposerpicturewidgetbase.ui: translation string fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15245
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-20
 
-2011-02-22  timlinux 
+    fix #7386 (yet another issue)
 
-	* src/app/qgstipfactory.cpp: Some cleanups and additions to Andreas'
-	tips git-svn-id: http://svn.osgeo.org/qgis/trunk@15244
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-03-20
 
-2011-02-22  timlinux 
+    composer legend feature counts add only to multi symbol or labeled single symbols
 
-	* src/app/qgstipfactory.cpp: Added another tip by Andreas Neumann git-svn-id: http://svn.osgeo.org/qgis/trunk@15243
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-20
 
-2011-02-22  mhugent 
+    fix #7386 (another issue)
 
-	* src/core/composer/qgscomposerlegend.cpp: Fix layer space if layer
-	title element is removed git-svn-id: http://svn.osgeo.org/qgis/trunk@15242
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-20
 
-2011-02-22  jef 
+    Fix activation of paste action after cut/copy
 
-	* doc/msvc.t2t: add note about debug libraries to msvc INSTALL
-	section git-svn-id: http://svn.osgeo.org/qgis/trunk@15241
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-20
 
-2011-02-22  timlinux 
-
-	* src/app/qgstipfactory.cpp: Added some more great tips from Andreas
-	Neumann git-svn-id: http://svn.osgeo.org/qgis/trunk@15240
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-22  stopa85 
-
-	* src/plugins/roadgraph/CMakeLists.txt,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.h,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/settingsdlg.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: add topology tolerance git-svn-id: http://svn.osgeo.org/qgis/trunk@15239
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  jef 
-
-	* src/core/qgsvectorfilewriter.cpp: fix #3137 git-svn-id: http://svn.osgeo.org/qgis/trunk@15238
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  wonder 
-
-	* src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp: Prompt whether
-	to overwrite a symbol. Contributed by Alex Bruy (#3405) git-svn-id: http://svn.osgeo.org/qgis/trunk@15237
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  wonder 
-
-	* src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2exportimportdialog.h,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.h,
-	src/ui/qgsstylev2exportimportdialogbase.ui,
-	src/ui/qgsstylev2managerdialogbase.ui: [FEATURE] Export and import
-	of styles (symbology-ng). Contributed by Alex Bruy (#3425) (finally we have an easy way for sharing of symbols and color
-	ramps!) git-svn-id: http://svn.osgeo.org/qgis/trunk@15236
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  mhugent 
-
-	* src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h,
-	src/core/qgsvectorlayer.cpp: Move reading/writing of label style to
-	qgsvectorlayer. Change argument in readCustomProperties to const.
-	Fixes problem with mixed label settings between qgis server projects git-svn-id: http://svn.osgeo.org/qgis/trunk@15235
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  gsherman 
-
-	* src/app/qgstipgui.cpp, src/app/qgstipgui.h,
-	src/ui/qgstipguibase.ui: Refactored the tips dialog to use a single
-	QTextBrowser to display content.  This makes better use of the
-	available space and cleans up the dialog a bit.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15234
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-21  jef 
+    german translation update
 
-	* python/plugins/osm/OsmLoadDlg.py,
-	src/providers/osm/osmprovider.cpp, src/providers/osm/osmprovider.h: 
-	fix #2996 git-svn-id: http://svn.osgeo.org/qgis/trunk@15233
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-19
 
-2011-02-21  stopa85 
+    Fixed QgsVectorLayer tests
 
-	* src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: pre topology tolerance
-	changeset git-svn-id: http://svn.osgeo.org/qgis/trunk@15232
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-19
 
-2011-02-20  jef 
+    Added convenience constructors for QgsFeatureRequest
 
-	* scripts/update-indent.sh: update update-indent.sh git-svn-id: http://svn.osgeo.org/qgis/trunk@15229
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-19
 
-2011-02-20  jef 
+    Fix for printing problems in line/point pattern and svg fill
 
-	* scripts/spelling.dat, src/app/qgstip.h, src/app/qgstipfactory.h,
-	src/core/qgsclipper.h: fix typos git-svn-id: http://svn.osgeo.org/qgis/trunk@15228
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  jef 
-
-	* src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposerlegendlayersdialog.cpp,
-	src/app/gps/qgsgpsmarker.cpp,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.cpp,
-	src/app/legend/qgslegendgroup.cpp, src/app/qgisapp.cpp,
-	src/app/qgsdisplayangle.cpp, src/app/qgsdisplayangle.h,
-	src/app/qgslabelpropertydialog.h, src/app/qgsmaptoolselect.cpp,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsmaprenderer.cpp, src/core/qgspallabeling.cpp,
-	src/core/spatialindex/include/Tools.h, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapoverviewcanvas.cpp,
-	src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassregion.cpp,
-	src/plugins/grass/qgsgrassregion.h,
-	src/plugins/grass/qgsgrassselect.cpp,
-	src/plugins/offline_editing/offline_editing_plugin_gui.cpp,
-	tests/src/core/regression992.cpp: automatic indentation update
-	(r14435-r15226) git-svn-id: http://svn.osgeo.org/qgis/trunk@15227
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15226
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  jef 
-
-	* src/app/qgstip.h, src/app/qgstipfactory.cpp,
-	src/app/qgstipfactory.h, src/app/qgstipgui.cpp,
-	src/app/qgstipgui.h, src/ui/qgstipguibase.ui: apply (slightly
-	modified) #3512 git-svn-id: http://svn.osgeo.org/qgis/trunk@15225
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  jef 
-
-	* src/app/qgspluginregistry.cpp: set plugin name and parent of c++
-	plugins - to allow other plugins to connect via
-	mainWindow().findChild() git-svn-id: http://svn.osgeo.org/qgis/trunk@15224
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  brushtyler 
-
-	* src/providers/grass/qgsgrassprovider.cpp: fix #1904 git-svn-id: http://svn.osgeo.org/qgis/trunk@15223
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  wonder 
-
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsstylev2.cpp,
-	src/core/symbology-ng/qgsstylev2.h,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.h,
-	src/ui/qgssymbolv2propertiesdialogbase.ui: Implemented renaming of
-	symbols and color ramps. Fixes #3509 git-svn-id: http://svn.osgeo.org/qgis/trunk@15222
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  wonder 
-
-	* src/app/legend/qgslegend.cpp: [FEATURE] zoom to group of layers.
-	Contributed by Alex Bruy - thanks! (#2783) git-svn-id: http://svn.osgeo.org/qgis/trunk@15220
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  wonder 
-
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Fix #3510 git-svn-id: http://svn.osgeo.org/qgis/trunk@15219
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-20  wonder 
-
-	* src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.h,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h,
-	src/ui/qgsrendererrulepropsdialogbase.ui,
-	src/ui/qgsrulebasedrendererv2widget.ui: [FEATURE] Labels for rules
-	in rule-based renderers and some other goodies.  Applied patch #3222
-	from Mayeul Kauffmann with various modifications.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15217
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  jef 
-
-	* CMakeLists.txt, cmake/FindQWT.cmake, cmake/FindQwt.cmake,
-	cmake/FindQwtPolar.cmake: apply #3506 git-svn-id: http://svn.osgeo.org/qgis/trunk@15215
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  brushtyler 
-
-	* src/app/CMakeLists.txt, src/app/postgres/qgspgsourceselect.h,
-	src/app/qgisapp.cpp, src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h,
-	src/app/qgsspatialitefilterproxymodel.cpp,
-	src/app/qgsspatialitefilterproxymodel.h,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/app/qgsspatialitesourceselect.h,
-	src/app/qgsspatialitesridsdialog.cpp,
-	src/app/qgsspatialitesridsdialog.h,
-	src/app/qgsspatialitetablemodel.cpp,
-	src/app/qgsspatialitetablemodel.h,
-	src/app/spatialite/qgsnewspatialitelayerdialog.cpp,
-	src/app/spatialite/qgsnewspatialitelayerdialog.h,
-	src/app/spatialite/qgsspatialitesourceselect.cpp,
-	src/app/spatialite/qgsspatialitesourceselect.h,
-	src/app/spatialite/qgsspatialitesridsdialog.cpp,
-	src/app/spatialite/qgsspatialitesridsdialog.h,
-	src/app/spatialite/qgsspatialitetablemodel.cpp,
-	src/app/spatialite/qgsspatialitetablemodel.h,
-	src/ui/qgsdbsourceselectbase.ui, src/ui/qgspgsourceselectbase.ui,
-	src/ui/qgsspatialitesourceselectbase.ui: Merged the source select
-	UIs for both PG and SL to allow to use a subset query loading a SL
-	layer git-svn-id: http://svn.osgeo.org/qgis/trunk@15214
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  jef 
+Alexander Bruy 	2013-03-19
 
-	* src/analysis/raster/qgsrastercalcparser.yy,
-	src/core/qgssearchstringlexer.ll, src/gui/CMakeLists.txt: fix msvc
-	fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15213
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix some tests broken by vector API cleanup
 
-2011-02-19  jef 
-
-	* i18n/qgis_de.ts, src/app/qgstipfactory.cpp: german translation
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@15212
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-03-19
 
-2011-02-19  jef 
-
-	* python/core/conversions.sip: r15197 worked with SIP 4.12.1 on
-	OSGeo4W r15205 breaks SIP 4.12.1 again, but apparently works on SIP
-	4.12.0 on OSX This hopefully works with both.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15211
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  jef 
-
-	* src/analysis/raster/qgsrastercalcparser.yy,
-	src/app/CMakeLists.txt,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.cpp,
-	src/app/qgisappinterface.h, src/core/CMakeLists.txt,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/gui/CMakeLists.txt,
-	src/gui/qgisinterface.h,
-	src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp,
-	src/providers/osm/osmstyle.cpp: fix internal use of deprecated
-	methods and fix related warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15210
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  jef 
-
-	* python/core/qgsapplication.sip, python/core/qgslabel.sip,
-	python/core/qgsmaplayer.sip, python/core/qgsmaprenderer.sip,
-	python/core/qgssearchtreenode.sip,
-	python/core/qgsvectordataprovider.sip,
-	python/core/qgsvectorfilewriter.sip,
-	python/core/qgsvectorlayer.sip, python/gui/qgisinterface.sip: add
-	'deprecated' annotation to SIP bindings git-svn-id: http://svn.osgeo.org/qgis/trunk@15209
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  jef 
-
-	* python/gui/qgsmapcanvas.sip, python/gui/qgsmapcanvasmap.sip,
-	src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h: deprecate
-	QgsMapCanvas::pixmap() following QgsMapCanvasMap::pixmap() git-svn-id: http://svn.osgeo.org/qgis/trunk@15208
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  timlinux 
-
-	* src/ui/qgssponsorsbase.ui: Added Municipia to sponsors list git-svn-id: http://svn.osgeo.org/qgis/trunk@15207
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  timlinux 
-
-	* : Updated icon from local histogram stretch from Robert (thanks
-	Robert) git-svn-id: http://svn.osgeo.org/qgis/trunk@15206
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  gsherman 
-
-	* python/core/conversions.sip: Fix failure when compiling on OS X
-	with Sip version 4.12.  sipClass_QVariant was undefined so it
-	appears it is still required to be defined at Sip 4.12. This has not
-	been tested on other platforms with this Sip version so may not be a
-	final fix.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15205
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-19  gsherman 
-
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/app/qgisapp.cpp: Fixed composer icon sizes git-svn-id: http://svn.osgeo.org/qgis/trunk@15204
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  wonder 
-
-	* src/core/qgssearchstringparser.yy: "in"/"not in" is a predicate
-	(#3503) git-svn-id: http://svn.osgeo.org/qgis/trunk@15203
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  alexbruy 
-
-	* src/app/qgstipfactory.cpp: fix typo in tip (replace openModeller
-	with Quantum GIS) git-svn-id: http://svn.osgeo.org/qgis/trunk@15202
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  jef 
-
-	* src/app/CMakeLists.txt: missed a gcc warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15201
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  jef 
-
-	* cmake/SIPMacros.cmake: fix sip macro change from r15197 git-svn-id: http://svn.osgeo.org/qgis/trunk@15200
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  timlinux 
-
-	* src/app/CMakeLists.txt, src/app/qgisapp.cpp,
-	src/app/qgsoptions.cpp, src/app/qgstipfactory.cpp,
-	src/app/qgstipfactory.h, src/ui/qgsoptionsbase.ui,
-	src/ui/qgstipguibase.ui: [FEATURE] Not sure how we coped without
-	this till now...we now have a tip presented at startup. You can
-	en/disable tips in the options panel. To contribute more tips,
-	please add them to src/app/qgstipfactory.cpp git-svn-id: http://svn.osgeo.org/qgis/trunk@15199
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  timlinux 
-
-	* src/app/qgstip.h, src/app/qgstipfactory.cpp,
-	src/app/qgstipfactory.h, src/app/qgstipgui.cpp,
-	src/app/qgstipgui.h, src/ui/qgstipguibase.ui: [FEATURE] Not sure how
-	we coped without this till now...we now have a tip presented at
-	startup. You can en/disable tips in the options panel. To contribute
-	more tips, please add them to src/app/qgstipfactory.cpp git-svn-id: http://svn.osgeo.org/qgis/trunk@15198
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-18  jef 
-
-	* cmake/SIPMacros.cmake, python/core/conversions.sip,
-	python/pyspatialite/src/statement.c, src/analysis/CMakeLists.txt,
-	src/app/CMakeLists.txt, src/app/legend/qgslegend.cpp,
-	src/app/qgssnappingdialog.cpp,
-	src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgslegendmodel.cpp, src/core/qgis.h,
-	src/core/qgsapplication.h, src/core/qgslabel.h,
-	src/core/qgsmaplayer.h, src/core/qgsmaprenderer.h,
-	src/core/qgsoverlayobject.h, src/core/qgssearchtreenode.h,
-	src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorfilewriter.h,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/gui/CMakeLists.txt, src/gui/qgisinterface.h,
-	src/gui/qgsmapcanvasmap.h, src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgscomparisonfilter.cpp,
-	src/mapserver/qgsprojectparser.cpp, src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgswmsserver.cpp,
-	src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/ogr_converter/ogrconverterguibase.ui,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/sqlanywhere/sanewconnectionbase.ui,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt,
-	tests/src/core/regression992.cpp,
-	tests/src/core/testqgsmaprenderer.cpp,
-	tests/src/core/testqgsrasterlayer.cpp,
-	tests/src/core/testqgsrenderers.cpp,
-	tests/src/core/testqgsvectorlayer.cpp: add QGISDEPRECATED macro and
-	fix a bunch of warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@15197
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: khmer by Khoem
 
-2011-02-18  jef 
+Alexandre Neto 	2013-03-19
 
-	* i18n/qgis_de.ts, src/ui/qgsprojectpropertiesbase.ui: fix wms
-	server settings tab title in project properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15196
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more portuguese translations and corrections
 
-2011-02-18  timlinux 
+Martin Dobias 	2013-03-19
 
-	* images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgsabout.cpp, src/app/qgssponsors.cpp,
-	src/app/qgssponsors.h, src/ui/qgsabout.ui,
-	src/ui/qgssponsorsbase.ui: Added dedicated dialog for the sponsors.
-	No longer parse sponsors from sponsors text file, just edit the html
-	in the dialog directly.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15195
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove the support for reading python plugin metadata from __init__.py
+    
+    From now on, plugins must have metadata.txt file (with INI format)
+    that is used for storing of metadata. This has two advantages:
+    - plugins do not need to be loaded in order to read metadata
+    - repository can parse the metadata more easily
 
-2011-02-18  dassau 
+Martin Dobias 	2013-03-17
 
-	* images/icons/sponsor_medals/README: small hint where to find the
-	medals at qgis.org git-svn-id: http://svn.osgeo.org/qgis/trunk@15194
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Do not load metadata from __init__.py
 
-2011-02-18  dassau 
+Victor Olaya 	2013-03-18
 
-	* : added sponsor medals from 2010 and 2011 git-svn-id: http://svn.osgeo.org/qgis/trunk@15193
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed problem in fix for #7348
 
-2011-02-18  timlinux 
+Radim Blazek 	2013-03-18
 
-	* images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h: Added
-	local histogram stretch icon to the new raster toolbar and wired it
-	up so it works git-svn-id: http://svn.osgeo.org/qgis/trunk@15192
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend: draw single symbol layers as single line
 
-2011-02-18  borysiasty 
+Larry Shaffer 	2013-03-18
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@15191
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Disable 'overloaded virtual' warning globally when using clang
+    
+    - Commit 1145bd2 now causing 200+ 'overloaded virtual' warnings
 
-2011-02-18  timlinux 
+Nyall Dawson 	2013-03-19
 
-	* src/app/legend/qgslegend.cpp: Fix but where layer does not refresh
-	when applying local histogram stretch and render caching is enabled.
-	Also update legend pixmap if performing a local stretch git-svn-id: http://svn.osgeo.org/qgis/trunk@15190
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move kernelShape enum to heatmap.h
 
-2011-02-18  timlinux 
+Merge: 5d62af3 d7d1ece
+Larry Shaffer 	2013-03-18
 
-	* src/app/qgsrasterlayerproperties.cpp: Raster Layer Props tidy up:
-	Used friendlier crs description in general props. Also don't use
-	deprecated maplayer::srs method anymore git-svn-id: http://svn.osgeo.org/qgis/trunk@15189
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #464 from dakcarto/nmake-with-jom_1
+    
+    Fix for #7289, add CMake option to enable building with Qt jom (nmake) on Windows
 
-2011-02-18  timlinux 
+Marco Hugentobler 	2013-03-18
 
-	* src/app/qgsvectorlayerproperties.cpp: Dont use deprecated call to
-	maplayer::srs git-svn-id: http://svn.osgeo.org/qgis/trunk@15188
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More coherent version string handling in qgis server
 
-2011-02-18  pcav 
+Tentotwo <1022tentotwo@gmail.com>	2013-03-18
 
-	* i18n/qgis_it.ts: Minor improvements to IT GUI - thanks to Leonardo
-	Ricci git-svn-id: http://svn.osgeo.org/qgis/trunk@15187
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added UI elements for specifying resolution in Rasterize
 
-2011-02-17  jef 
+Merge: 5743f52 713d3c1
+Nathan Woodrow 	2013-03-18
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsmapserverlogger.cpp: mapserver: use default message
-	handler for debugging output on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15186
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #468 from slarosa/master
+    
+    replace some message box with message bar in main app
 
-2011-02-17  jef 
+Salvatore Larosa 	2013-03-14
 
-	* src/core/composer/qgscomposerlegenditem.h,
-	src/core/qgsproject.cpp, src/core/qgsvectorlayer.h,
-	src/core/qgsvectorlayerjoinbuffer.h: doxygen fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15185
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    replace some message box with message bar in main app
 
-2011-02-17  jef 
+Juergen E. Fischer 	2013-03-18
 
-	* src/gui/qgssearchquerybuilder.cpp: fix #3499 git-svn-id: http://svn.osgeo.org/qgis/trunk@15184
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7386
 
-2011-02-17  jef 
+Marco Hugentobler 	2013-03-18
 
-	* src/app/qgsnewhttpconnection.cpp: strip off superfluous parameters
-	from WMS server url (for the common case that GetCapabilities
-	request urls are advertised) git-svn-id: http://svn.osgeo.org/qgis/trunk@15183
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Filter string in qgis server: Allow strings and attribute names with spaces
 
-2011-02-17  jef 
+Nyall Dawson 	2013-03-18
 
-	* src/app/qgisapp.cpp: record which SSL errors are ok to ignore git-svn-id: http://svn.osgeo.org/qgis/trunk@15182
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add triweight and Epanechnikov kernels. Make decay disabled for all kernels expect Triangular kernel. Fix math for triangular kernels.
 
-2011-02-17  mhugent 
+Merge: ec01afb 9a81fa7
+Nyall Dawson 	2013-03-17
 
-	* src/app/qgslabelinggui.cpp: Show all layer fields in labeling
-	dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15181
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into heatmap_kernels
 
-2011-02-17  mhugent 
+Merge: 8966e9e 239479a
+Nathan Woodrow 	2013-03-17
 
-	* python/core/qgsvectorlayer.sip,
-	src/app/legend/qgslegendlayer.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h: Safer handling of layers with unknown
-	geometry git-svn-id: http://svn.osgeo.org/qgis/trunk@15180
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #461 from nyalldawson/heatmap_fixes
+    
+    Massive speedup to heatmap plugin (fix #6756, fix #6691 and fix #6692)
 
-2011-02-16  jef 
+Nathan Woodrow 	2013-03-17
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/attributetable/qgsattributetablemodel.h,
-	src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h,
-	src/core/qgssearchstringparser.yy: add support to set fields to NULL
-	in field calculator and fix following update of attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@15179
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-16  jef 
-
-	* src/core/qgsvectorfilewriter.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: fix #3945 (following up on
-	r15148) git-svn-id: http://svn.osgeo.org/qgis/trunk@15178
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-16  jef 
-
-	* src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: fix #3490 git-svn-id: http://svn.osgeo.org/qgis/trunk@15177
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-16  mhugent 
-
-	* src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp,
-	src/core/qgspallabeling.h, src/ui/qgslabelingguibase.ui: [FEATURE]:
-	possibility to set label distance in map units git-svn-id: http://svn.osgeo.org/qgis/trunk@15176
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-15  jef 
-
-	* src/gui/qgssearchquerybuilder.cpp: apply patch for #3347 from
-	kcube git-svn-id: http://svn.osgeo.org/qgis/trunk@15175
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-15  mhugent 
-
-	* src/app/legend/qgslegendlayer.cpp, src/core/qgsvectorlayer.cpp: 
-	Fix for other multiple redraws git-svn-id: http://svn.osgeo.org/qgis/trunk@15174
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-15  mhugent 
-
-	* src/app/qgsvectorlayerproperties.cpp: Fewer redraws if toggeling
-	editing from vector props git-svn-id: http://svn.osgeo.org/qgis/trunk@15173
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  mhugent 
-
-	* src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h: Remove
-	some duplicated code git-svn-id: http://svn.osgeo.org/qgis/trunk@15169
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  jef 
-
-	* python/core/qgsapplication.sip, python/core/qgscomposermap.sip,
-	python/core/qgslabel.sip, python/core/qgsmaplayer.sip,
-	python/core/qgsoverlayobject.sip, python/core/qgsrenderer.sip,
-	python/core/qgssearchtreenode.sip,
-	python/core/qgsvectordataprovider.sip,
-	python/core/qgsvectorlayer.sip,
-	python/plugins/osm/OsmDatabaseManager.py,
-	python/plugins/osm/OsmLoadDlg.py,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp,
-	src/app/qgisapp.cpp, src/app/qgisappinterface.cpp,
-	src/app/qgsaddjoindialog.cpp, src/app/qgsattributedialog.cpp,
-	src/app/qgsmaptoolidentify.cpp, src/app/qgsprojectproperties.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgssnappingdialog.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgslegendmodel.cpp, src/core/qgsapplication.h,
-	src/core/qgslabel.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayer.h, src/core/qgsmaplayerregistry.cpp,
-	src/core/qgsmaprenderer.h, src/core/qgsoverlayobject.h,
-	src/core/qgspallabeling.cpp, src/core/qgspluginlayerregistry.cpp,
-	src/core/qgssearchtreenode.h, src/core/qgsvectordataprovider.h,
-	src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/gui/qgisinterface.h,
-	src/gui/qgsformannotationitem.cpp, src/gui/qgsmapcanvas.cpp,
-	src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsprojectparser.cpp, src/mapserver/qgswmsserver.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qtermwidget/TerminalDisplay.cpp,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.
-	cpp, src/plugins/roadgraph/exportdlg.cpp,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/memory/qgsmemoryprovider.cpp: fix API
-	QgsMapLayer::getLayerID() to id()), some warnings and use doxygen
-	deprecation tag.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15168
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  pcav 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fa.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts,
-	i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_ta.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: Updated IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15167
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15166
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  jef 
-
-	* src/app/ogr/qgsopenvectorlayerdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h,
-	src/providers/ogr/qgsogrprovider.cpp: fix #3477 & #3778 git-svn-id: http://svn.osgeo.org/qgis/trunk@15165
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  jef 
-
-	* i18n/qgis_de.ts, src/ui/qgsaddjoindialogbase.ui: german
-	translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15164
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-13  pcav 
-
-	* src/plugins/grass/modules-6.4/r.external.all.qgm,
-	src/plugins/grass/modules-6.4/r.external.qgis.qgm,
-	src/plugins/grass/modules-6.4/r.external.qgm: Improve the
-	description of some GRASS modules git-svn-id: http://svn.osgeo.org/qgis/trunk@15163
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  jef 
-
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgsmapserverlogger.cpp,
-	src/mapserver/qgsmapserverlogger.h,
-	src/mapserver/qgsmslayercache.cpp,
-	src/mapserver/qgsremotedatasourcebuilder.cpp,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/mapserver/qgssentdatasourcebuilder.cpp,
-	src/mapserver/qgssldparser.cpp, src/mapserver/qgssldrule.cpp,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgswmsserver.cpp: mapserver: semicolon removed from
-	QgsMSDebugMsg macro git-svn-id: http://svn.osgeo.org/qgis/trunk@15162
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  jef 
-
-	* src/mapserver/qgsprojectparser.cpp: mapserver: fix crash when
-	layer cache is to small for project git-svn-id: http://svn.osgeo.org/qgis/trunk@15161
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  jef 
-
-	* src/core/qgsprojectproperty.cpp: fix crash git-svn-id: http://svn.osgeo.org/qgis/trunk@15160
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  jef 
-
-	* src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h,
-	src/ui/qgsprojectpropertiesbase.ui: allow setting mapserver service
-	properties in project properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15159
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  jef 
-
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsmapserverlogger.cpp: add more debugging output to
-	mapserver git-svn-id: http://svn.osgeo.org/qgis/trunk@15158
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-12  mhugent 
-
-	* src/app/qgsvectorlayerproperties.cpp: Fix multiple redraws when
-	adding join from dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15157
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-11  jef 
-
-	* src/plugins/spit/qgsdbfbase.h, src/plugins/spit/qgsshapefile.cpp: 
-	fix #2551 git-svn-id: http://svn.osgeo.org/qgis/trunk@15156
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-11  mhugent 
-
-	* images/images.qrc, src/app/CMakeLists.txt,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/qgsaddjoindialog.cpp, src/app/qgsaddjoindialog.h,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h, src/core/CMakeLists.txt,
-	src/core/qgsdataprovider.h, src/core/qgsproject.cpp,
-	src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/qgsvectorlayerjoinbuffer.cpp,
-	src/core/qgsvectorlayerjoinbuffer.h,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h,
-	src/ui/qgsaddjoindialogbase.ui,
-	src/ui/qgsvectorlayerpropertiesbase.ui: [FEATURE]: experimental
-	table join support refactored and ported from branch to trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@15155
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-10  cfarmer 
-
-	* python/plugins/fTools/tools/doPointDistance.py: fix bug where k+1
-	closest feature are measured in point distance tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15153
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-10  cfarmer 
-
-	* python/plugins/fTools/tools/frmVectorGrid.ui: allow for more
-	precise grid dimentions in vector grid tool git-svn-id: http://svn.osgeo.org/qgis/trunk@15152
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-10  cfarmer 
-
-	* python/plugins/fTools/tools/doDefineProj.py: quick fix for problem
-	when assigning crs of existing layer git-svn-id: http://svn.osgeo.org/qgis/trunk@15151
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-09  jef 
-
-	* src/analysis/raster/qgsninecellfilter.cpp,
-	src/analysis/raster/qgsrastercalculator.cpp,
-	src/analysis/raster/qgsrastercalculator.h,
-	src/analysis/vector/qgszonalstatistics.cpp,
-	src/app/ogr/qgsnewogrconnection.cpp,
-	src/core/raster/qgsrasterlayer.cpp, src/mapserver/qgssldparser.cpp,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/ogr_converter/dialog.cpp,
-	src/plugins/ogr_converter/translator.cpp,
-	src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp,
-	src/plugins/spit/qgsshapefile.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: add support for UTF8 in
-	GDAL/OGR 1.8 (fixes #2551) git-svn-id: http://svn.osgeo.org/qgis/trunk@15148
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-09  jef 
-
-	* src/core/qgsclipper.h, src/core/qgsmaplayer.h,
-	src/core/qgsproject.cpp, src/gui/qgisgui.h,
-	src/gui/qgssearchquerybuilder.h: doxygen fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15147
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-09  pcav 
-
-	* i18n/qgis_it.ts: Minor improvements to the IT GUI - thanks to the
-	GFOSS.it community git-svn-id: http://svn.osgeo.org/qgis/trunk@15146
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-09  jef 
-
-	* src/providers/wms/qgswmsprovider.cpp: fix debugging output for
-	Qt<4.5 git-svn-id: http://svn.osgeo.org/qgis/trunk@15145
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  jef 
+    Ability to change splash screen using QgsCustomization
 
-	* src/app/qgswmssourceselect.cpp, src/gui/qgscredentialdialog.cpp: 
-	restore arrow cursor when asking for credentials git-svn-id: http://svn.osgeo.org/qgis/trunk@15144
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  jef 
+Nathan Woodrow 	2013-03-17
 
-	* debian/changelog, debian/control: revert debian part of r15142 git-svn-id: http://svn.osgeo.org/qgis/trunk@15143
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  pcav 
-
-	* debian/changelog, debian/control, i18n/qgis_it.ts: Minor
-	improvement to the IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15142
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h: also use 24px as
-	default icon size in options git-svn-id: http://svn.osgeo.org/qgis/trunk@15141
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  alexbruy 
-
-	* src/app/qgsmanageconnectionsdialog.cpp,
-	src/app/qgsmanageconnectionsdialog.h,
-	src/ui/qgsmanageconnectionsdialogbase.ui: don't close Manage
-	connections dialog after processing selected file.  Allow user
-	select another file and run save/load operation again git-svn-id: http://svn.osgeo.org/qgis/trunk@15140
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #7030. Enable customization via command line
 
-2011-02-08  mhugent 
+Merge: 5d42734 cb685e9
+Nathan Woodrow 	2013-03-16
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_svgfill.ui: [FEATURE]: rotation for svg
-	fills git-svn-id: http://svn.osgeo.org/qgis/trunk@15139
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #466 from nyalldawson/master
+    
+    Rename Quantile classifier to 'Quantile (Equal Count)'
 
-2011-02-08  mhugent 
+Martin Dobias 	2013-03-16
 
-	* src/core/qgsrectangle.cpp: Use qIsNaN and qIsInf for
-	QgsRectangle::isFinite git-svn-id: http://svn.osgeo.org/qgis/trunk@15138
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Removed old vector layer API (select(), nextFeature(), featureAtId())
 
-2011-02-08  timlinux 
-
-	* src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.qrc,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: Improvements
-	to spatial select plugin from Luiz Motta (#2634) git-svn-id: http://svn.osgeo.org/qgis/trunk@15137
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-02-08  gsherman 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/ui/qgsoptionsbase.ui: Option for user to
-	set icon size to 16, 24, or 32 px.  Contributed by madmanwoo
-	(NathanW) git-svn-id: http://svn.osgeo.org/qgis/trunk@15136
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-16
 
-2011-02-08  brushtyler 
+    Format number strings with field precision for display in attribute table, attribute dialog and editor
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/resources.qrc,
-	python/plugins/GdalTools/tools/doTileIndex.py,
-	python/plugins/GdalTools/tools/widgetTileIndex.ui: Applied the patch
-	attached to #3331 to implement gdaltindex. Thanks alexbruy! git-svn-id: http://svn.osgeo.org/qgis/trunk@15135
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-15
 
-2011-02-07  mhugent 
+    [sextante] better behaviour in batch processing interface
 
-	* src/core/qgsmaprenderer.cpp: Fix for ticket #3471 git-svn-id: http://svn.osgeo.org/qgis/trunk@15131
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-15
 
-2011-02-05  jef 
+    [sextante] added import check for gdal sieve algorithm
 
-	* python/gui/qgsmapcanvas.sip: paintEvent isn't a signal git-svn-id: http://svn.osgeo.org/qgis/trunk@15130
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-15
 
-2011-02-05  pcav 
+    [sextante] changed "usergdal" option in R algorithms to "dontuserasterpackage"
 
-	* i18n/qgis_it.ts: Minor improvements to IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15129
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-15
 
-2011-02-04  jef 
+    [sextante] fixes in batch processing interface for #7348
 
-	* CMakeLists.txt, cmake/FindQwtPolar.cmake, src/app/CMakeLists.txt: 
-	optionally use external qwtpolar library git-svn-id: http://svn.osgeo.org/qgis/trunk@15128
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-15
 
-2011-02-04  mhugent 
+    [sextante] changed how recent algs group is updated
 
-	* src/core/composer/qgscomposerlegenditem.cpp,
-	src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/mapserver/qgsprojectparser.cpp: Read composer legend content
-	from project file for WMS print (ignoring the possibility of
-	dynamically added layers for now) git-svn-id: http://svn.osgeo.org/qgis/trunk@15127
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-03-12
 
-2011-02-04  timlinux 
+    [sextante]added new OTB description
 
-	* src/app/qgisapp.cpp: Revert "Applied patch from #3447. Button
-	group for add layer" This reverts commit d1dfeae396b244bcb76076ef9ab80bfc42d05587.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15126
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-15
 
-2011-02-03  brushtyler 
+    Fix reading of units from project files before output unit change
 
-	* python/plugins/GdalTools/tools/doClipper.py: fixed #3449 making
-	sure the clipping result has the layers order as in TOC git-svn-id: http://svn.osgeo.org/qgis/trunk@15125
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-15
 
-2011-02-03  mhugent 
+    Convert composer entry in project file from 1.8 to 1.9 format for QGIS Server
 
-	* src/core/composer/qgscomposition.cpp,
-	src/core/composer/qgscomposition.h, src/mapserver/qgswmsserver.cpp,
-	src/mapserver/qgswmsserver.h: Option to print as raster also via WMS
-	(mainly as a workaround because of some Qt pdf problems git-svn-id: http://svn.osgeo.org/qgis/trunk@15124
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 6afd9f4 3b9c688
+Marco Hugentobler 	2013-03-15
 
-2011-02-03  jef 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: update indentation of
-	roadgraph plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@15123
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1e30eb0 af1bde9
+Marco Hugentobler 	2013-03-15
 
-2011-02-03  stopa85 
+    Merge branch 'data_defined_symbology'
 
-	* src/plugins/roadgraph/CMakeLists.txt,
-	src/plugins/roadgraph/graphbuilder.cpp,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h: roadgraph plugin
-	refactoring. Step 1 of 3.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15122
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2013-03-15
 
-2011-02-02  mhugent 
+    Update the expression geomFromGML2 to geomFromGML
+    
+    Like we simplified the QgsOgcUtils class, I simplify the expression with
+    renamed geomFromGML2 to geomFromGML.
+    This update gives me the ability to debugging geometryFromGML with
+    Envelope element.
 
-	* src/app/qgisapp.cpp: Remaining fix for bug #3459 git-svn-id: http://svn.osgeo.org/qgis/trunk@15121
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-02-23
 
-2011-02-02  jef 
+    - add find by UUID
 
-	* resources/context_help/QgsWMSSourceSelect-de_DE: german
-	translation update (followup on r15119) git-svn-id: http://svn.osgeo.org/qgis/trunk@15120
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-02-20
 
-2011-02-02  pcav 
+    Implemented ComposerItem's Uuids
+    
+    - uuid are kept on cut/paste, but deleted on import template or copy/paste
+    - removed obsolete id reference in QgsComposerLabelWidget
 
-	* resources/context_help/QgsWMSSourceSelect-en_US,
-	src/app/qgswmssourceselect.cpp: Remove JPL WMS server - fixes #3464 git-svn-id: http://svn.osgeo.org/qgis/trunk@15119
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexandre Neto 	2013-03-15
 
-2011-02-01  jef 
+    Portugues translations
 
-	* INSTALL, doc/INSTALL.t2t, doc/linux.t2t: INSTALL fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15118
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-15
 
-2011-02-01  jef 
+    Moved expression to OGC filter code to QgsOgcUtils
 
-	* debian/changelog, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick,
-	debian/control.natty, debian/control.sid, debian/control.squeeze: 
-	debian packaging fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15117
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-13
 
-2011-02-01  mhugent 
+    Moved visitor-based expression -> OGC filter code to QgsOgcUtils
 
-	* src/core/composer/qgscomposermap.cpp: Handle negative rotation
-	values in composer map grid git-svn-id: http://svn.osgeo.org/qgis/trunk@15116
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-03-13
 
-2011-02-01  rduivenvoorde 
+    Moved creation of expression from OGC filter to QgsOgcUtils
 
-	* i18n/qgis_nl.ts: batch of new dutch translations git-svn-id: http://svn.osgeo.org/qgis/trunk@15115
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-14
 
-2011-02-01  mhugent 
+    hide clear button in filter line edit, when widget is disabled
 
-	* src/app/legend/qgslegendlayer.cpp: Fix #3459 (uncheck feature
-	count) git-svn-id: http://svn.osgeo.org/qgis/trunk@15114
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-14
 
-2011-02-01  mhugent 
+    fix #7357
 
-	*
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.
-	cpp: Fix #3411 git-svn-id: http://svn.osgeo.org/qgis/trunk@15113
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-14
 
-2011-02-01  mhugent 
+    fix QgsRasterInterface sip bindings
 
-	* src/mapserver/qgsconfigparser.cpp: Set composer grid intervals x/y
-	from WMS getPrint request git-svn-id: http://svn.osgeo.org/qgis/trunk@15112
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-12
 
-2011-01-31  mhugent 
+    add icons for new raster tools (thanks, Robert!)
 
-	* src/mapserver/qgsconfigparser.cpp: Change getPrint syntax to use
-	several parameters for composer maps, e.g.
-	map0:extent=xmin,ymin,xmax,ymax or map0:rotation=45 git-svn-id: http://svn.osgeo.org/qgis/trunk@15111
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-11
 
-2011-01-31  stopa85 
+    [API] add read/writeXML methods to QgsRasterInterface
 
-	* src/plugins/roadgraph/linevectorlayerdirector.cpp: fix: Road graph
-	plugin crash qgis when use spatelite as source layer git-svn-id: http://svn.osgeo.org/qgis/trunk@15110
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-11
 
-2011-01-31  stopa85 
+    [FEATURE] brightness and contrast filter for rasters
 
-	* src/plugins/roadgraph/shortestpathwidget.cpp: fix NULL pointer
-	assigment.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15109
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-14
 
-2011-01-30  jef 
+    fix Export geometry info tool (fix #7354)
 
-	* src/core/qgsvectorfilewriter.cpp: fix #3374 git-svn-id: http://svn.osgeo.org/qgis/trunk@15108
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-14
 
-2011-01-29  jef 
+    Set combo box maximum for precision <= type length
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix #3451: don't
-	recheck saved primary key column for views when 'use estimates' is
-	on git-svn-id: http://svn.osgeo.org/qgis/trunk@15107
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-14
 
-2011-01-29  jef 
+    save used contrast enhancement algorithm in private class member (follow up 5ecb26810a)
 
-	* src/core/symbology-ng/qgsrendererv2.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15106
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-14
 
-2011-01-29  jef 
+    Prevent overshoots with line offsets
 
-	* ms-windows/osgeo4w/qgis.bat.tmpl: missed to update the
-	qgis.bat.tmpl git-svn-id: http://svn.osgeo.org/qgis/trunk@15105
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-14
 
-2011-01-29  jef 
+    update Vector Grid to vector API changes (fix #7322)
 
-	* ms-windows/osgeo4w/package-nightly.cmd,
-	ms-windows/osgeo4w/package.cmd: update osgeo4w build to use standard
-	GDAL (now 1.8) to build git-svn-id: http://svn.osgeo.org/qgis/trunk@15104
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-03-14
 
-2011-01-29  pcav 
+    Identify GetFeatureInfo Url context menu fix
 
-	* src/plugins/grass/modules-common/v.sample.qgm: Fix v.sample GRASS
-	module git-svn-id: http://svn.osgeo.org/qgis/trunk@15103
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-14
 
-2011-01-28  jef 
+    update Random and Regular points tools to API changes (fix #7350)
 
-	* src/mapserver/qgis_map_serv.cpp, src/mapserver/qgswmsserver.cpp: 
-	mapserver: don't crash when WIDTH or HEIGHT are missing.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15102
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-01-31
 
-2011-01-28  mhugent 
+    restore "stretch using current extent" functionality in layer context
+    menu (fix #7070)
 
-	* src/core/symbology-ng/qgsrendererv2.cpp: Fix reprojection problem
-	for polygons too git-svn-id: http://svn.osgeo.org/qgis/trunk@15101
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-14
 
-2011-01-28  jef 
+    OGR typedefs do not seem to be necessary
 
-	* i18n/qgis_ru.ts: russian translation update (merged road graph
-	plugin translations) git-svn-id: http://svn.osgeo.org/qgis/trunk@15100
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-13
 
-2011-01-28  jef 
+    [FEATURE] attribute editing extension
+    - allow resetting of fields to NULL by button
+    - use user defined date formats in forms, identify results and attribute table
+    - add support for date type in postgres provider
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15099
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-14
 
-2011-01-28  jef 
+    Change float to double for calculations
 
-	* src/plugins/roadgraph/exportdlg.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/linevectorlayerwidget.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/shortestpathwidget.cpp: some translation
-	string fixes in road graph plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@15098
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 032c5f5 239479a
+Nyall Dawson 	2013-03-14
 
-2011-01-28  jef 
+    Merge heatmap_fixes branch
 
-	* debian/changelog, debian/qgis.install: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@15097
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2013-03-13
 
-2011-01-28  jef 
+    Simplifying QgsOgcUtils
+    
+    After commit 7d66529d7884b73070dbce80b1d4060d841a6933 Add GML3 to
+    QgsOgcUtils, I have to simplify this class to only have :
+    * geometryFromGML : read GML2 or GML3
+    * geometryToGML : create GML2 (as default) or GML3
 
-	* CMakeLists.txt: build with -fno-strict-aliasing on powerpc (see
-	bugs.debian.org/603986) git-svn-id: http://svn.osgeo.org/qgis/trunk@15096
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-28  mhugent 
+    Let subsymbols have their own units
 
-	* src/core/qgsclipper.cpp, src/core/symbology-ng/qgsrendererv2.cpp: 
-	Fix line coordinate transform git-svn-id: http://svn.osgeo.org/qgis/trunk@15095
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-28  timlinux 
+    Output units for point pattern and line pattern symbol layers
 
-	* src/app/qgisapp.cpp: Applied patch from #3447. Button group for
-	add layer git-svn-id: http://svn.osgeo.org/qgis/trunk@15094
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-28  stopa85 
+    Output units for line pattern fill symbollayer
 
-	* src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.h,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/settingsdlg.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp: Separate gui-part and
-	graph construction part. Added message box in shortestpath widget.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15093
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-13
 
-2011-01-28  mhugent 
+    fix Join attributes by location (#7103)
 
-	* src/ui/qgscomposeritemwidgetbase.ui: Better description for button git-svn-id: http://svn.osgeo.org/qgis/trunk@15092
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-13
 
-2011-01-27  pcav 
+    fix Sum line length tool after API changes (fix #7335)
 
-	* i18n/qgis_it.ts: Minor IT GUI improvements git-svn-id: http://svn.osgeo.org/qgis/trunk@15091
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-13
 
-2011-01-27  mhugent 
+    add tooltip to button in sigleband pseudocolor renderer widget
+    (addresses #7138)
 
-	* src/core/qgsclipper.cpp, src/core/qgsclipper.h,
-	src/core/symbology-ng/qgsrendererv2.cpp: Use 'fast clip' line
-	clipping algorithm for long lines. Huge improvement for wms
-	benchmark performance (long contour lines) git-svn-id: http://svn.osgeo.org/qgis/trunk@15090
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-03-13
 
-2011-01-27  mhugent 
+    fix maximum field value calculation in vector layer (addresses #7193)
 
-	* src/mapserver/qgsconfigparser.cpp: Add a scale parameter for maps
-	in the getPrint request git-svn-id: http://svn.osgeo.org/qgis/trunk@15089
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-27  mhugent 
+    Output units for svg fill
 
-	* src/mapserver/qgswmsserver.cpp: Use full page for pdf in getPrint
-	request git-svn-id: http://svn.osgeo.org/qgis/trunk@15088
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-03-13
 
-2011-01-26  mhugent 
+    composer legend width fix, fixes #7099
 
-	* src/core/qgspoint.cpp: Prevent rounding error if point is on
-	segment. Fixes bug #2921 git-svn-id: http://svn.osgeo.org/qgis/trunk@15087
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-13
 
-2011-01-26  mhugent 
+    Use double rather than float when appropriate to improve precision of heatmaps
 
-	* src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h: Support relative project pathes in
-	wms server git-svn-id: http://svn.osgeo.org/qgis/trunk@15086
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-26  mhugent 
+    Output units for simple fill symbol layer
 
-	* src/mapserver/qgshttprequesthandler.cpp: Fix output format for
-	getPrint git-svn-id: http://svn.osgeo.org/qgis/trunk@15085
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2013-03-12
 
-2011-01-26  macho 
+    Add GML3 to QgsOgcUtils
+    
+    After the commit 969df016bcdbd1ead8a347b7a5d55c8b36db183a Moved GML import/export to a new class: QgsOgcUtils, I decided to add GML3.
+    I updated QgsOgcUtils, QGIS WFS Server, and the Python Iterface and I added unit test for GML3.
 
-	* i18n/qgis_fa.ts: translation update: fa by mola git-svn-id: http://svn.osgeo.org/qgis/trunk@15084
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-03-13
 
-2011-01-26  stopa85 
+    WMS GetFeatureInfo supported formats fix, fixes #7238
 
-	* src/plugins/roadgraph/Doxyfile,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayersettings.cpp,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h,
-	src/plugins/roadgraph/utils.h: add RoadGraphPlugin doxyfile. Fix
-	doxygen warnings.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15083
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-03-13
 
-2011-01-26  mhugent 
-
-	* src/mapserver/qgsprojectparser.cpp: Add element to group composer
-	templates in WMS capabilities git-svn-id: http://svn.osgeo.org/qgis/trunk@15082
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  jef 
-
-	* CMakeLists.txt, debian/rules: gitmarker: fix cmake warning and
-	don't append something w/o local changes git-svn-id: http://svn.osgeo.org/qgis/trunk@15080
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  jef 
-
-	* src/python/qgspythonutilsimpl.cpp: skip empty parts of
-	QGIS_PLUGINPATH git-svn-id: http://svn.osgeo.org/qgis/trunk@15079
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  alexbruy 
-
-	* python/plugins/GdalTools/tools/doTranslate.py: use correct expand
-	option when combobox items translated git-svn-id: http://svn.osgeo.org/qgis/trunk@15078
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  mhugent 
-
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsprojectparser.cpp, src/mapserver/qgswmsserver.cpp,
-	src/mapserver/qgswmsserver.h: Improve GetLegendGraphics output in
-	wms server git-svn-id: http://svn.osgeo.org/qgis/trunk@15077
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  jef 
-
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: fix #3434 git-svn-id: http://svn.osgeo.org/qgis/trunk@15076
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  timlinux 
-
-	* python/gui/qgsmapcanvas.sip: #3420 fix for map canvas rerender not
-	working under python git-svn-id: http://svn.osgeo.org/qgis/trunk@15075
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  gsherman 
-
-	* python/core/qgscoordinatereferencesystem.sip,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.h,
-	src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h,
-	src/providers/memory/qgsmemoryprovider.cpp,
-	src/providers/memory/qgsmemoryprovider.h: Patch for delimited text,
-	ticket #3414. Submitted by ccrook.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15074
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-25  jef 
-
-	* src/python/qgspythonutilsimpl.cpp: don't split QGIS_PLUGINPATH at
-	colon on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15073
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  jef 
-
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: postgres provider
-	update: use st_ functions only with postgis>=2 and the old one with
-	earlier postgis version git-svn-id: http://svn.osgeo.org/qgis/trunk@15072
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  jef 
-
-	* INSTALL, doc/osx.t2t, python/pyspatialite/src/cursor.c,
-	scripts/chkspelling.sh, src/astyle/ASBeautifier.cpp,
-	src/astyle/ASEnhancer.cpp, src/astyle/ASFormatter.cpp,
-	src/core/qgspallabeling.h,
-	src/core/spatialite/headers/spatialite/gaiageo.h,
-	src/core/spatialite/headers/spatialite/sqlite3.h,
-	src/core/spatialite/headers/spatialite/sqlite3ext.h,
-	src/core/spatialite/spatialite.c, src/mapserver/CMakeLists.txt,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/plugins/roadgraph/CMakeLists.txt,
-	src/plugins/roadgraph/exportdlg.cpp,
-	src/plugins/roadgraph/exportdlg.h,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/linevectorlayersettings.cpp,
-	src/plugins/roadgraph/linevectorlayersettings.h,
-	src/plugins/roadgraph/linevectorlayerwidget.cpp,
-	src/plugins/roadgraph/linevectorlayerwidget.h,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.h,
-	src/plugins/roadgraph/settings.h,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/settingsdlg.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/shortestpathwidget.h,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h,
-	src/plugins/roadgraph/units.cpp, src/plugins/roadgraph/units.h,
-	src/plugins/roadgraph/utils.cpp, src/plugins/roadgraph/utils.h,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp: fix windows
-	build, warnings, typos and roadgraph plugin indentation git-svn-id: http://svn.osgeo.org/qgis/trunk@15071
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  mhugent 
-
-	* src/mapserver/qgsprojectparser.cpp: Different format for embedded
-	wms service metadata git-svn-id: http://svn.osgeo.org/qgis/trunk@15070
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  mhugent 
-
-	* src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h: Fix for accessing groups in
-	mapserver git-svn-id: http://svn.osgeo.org/qgis/trunk@15069
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  stopa85 
-
-	* src/plugins/CMakeLists.txt, src/plugins/roadgraph/CMakeLists.txt,
-	src/plugins/roadgraph/exportdlg.cpp,
-	src/plugins/roadgraph/exportdlg.h,
-	src/plugins/roadgraph/graphbuilder.h,
-	src/plugins/roadgraph/graphdirector.h,
-	src/plugins/roadgraph/linevectorlayerdirector.cpp,
-	src/plugins/roadgraph/linevectorlayerdirector.h,
-	src/plugins/roadgraph/linevectorlayersettings.cpp,
-	src/plugins/roadgraph/linevectorlayersettings.h,
-	src/plugins/roadgraph/linevectorlayerwidget.cpp,
-	src/plugins/roadgraph/linevectorlayerwidget.h,
-	src/plugins/roadgraph/roadgraph.qrc,
-	src/plugins/roadgraph/roadgraphplugin.cpp,
-	src/plugins/roadgraph/roadgraphplugin.h,
-	src/plugins/roadgraph/settings.h,
-	src/plugins/roadgraph/settingsdlg.cpp,
-	src/plugins/roadgraph/settingsdlg.h,
-	src/plugins/roadgraph/shortestpathwidget.cpp,
-	src/plugins/roadgraph/shortestpathwidget.h,
-	src/plugins/roadgraph/showdirect.svg,
-	src/plugins/roadgraph/simplegraphbuilder.cpp,
-	src/plugins/roadgraph/simplegraphbuilder.h,
-	src/plugins/roadgraph/units.cpp, src/plugins/roadgraph/units.h,
-	src/plugins/roadgraph/utils.cpp, src/plugins/roadgraph/utils.h: 
-	Road-Graph plugin added git-svn-id: http://svn.osgeo.org/qgis/trunk@15068
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-24  mhugent 
-
-	* src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h, src/mapserver/qgswmsserver.cpp: 
-	[FEATURE]: Optionally specify wms service capabilities in the
-	properties section of the project file (instead of wms_metadata.xml
-	file) git-svn-id: http://svn.osgeo.org/qgis/trunk@15067
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-22  jef 
-
-	* CMakeLists.txt: show number of local git commits since last svn
-	revision git-svn-id: http://svn.osgeo.org/qgis/trunk@15066
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-22  jef 
-
-	* CMakeLists.txt: retrieve svn revision from git log instead of git
-	svn info git-svn-id: http://svn.osgeo.org/qgis/trunk@15065
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-21  mhugent 
-
-	* python/core/qgscomposerlabel.sip,
-	src/app/composer/qgscomposerlabelwidget.cpp,
-	src/app/composer/qgscomposerlabelwidget.h,
-	src/core/composer/qgscomposeritemcommand.h,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlabel.h,
-	src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/ui/qgscomposerlabelwidgetbase.ui: WMS print: manual setting for
-	exported label ids, display paper width and height in capabilities git-svn-id: http://svn.osgeo.org/qgis/trunk@15064
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-21  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: pl translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@15062
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-21  mhugent 
-
-	* src/mapserver/qgsconfigparser.cpp: Wms print: keep not referenced
-	labels with default text git-svn-id: http://svn.osgeo.org/qgis/trunk@15061
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-20  jef 
-
-	* src/core/qgscoordinatetransform.cpp: drop special projection path
-	handling on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@15059
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-19  jef 
-
-	* src/gui/qgsattributeeditor.cpp: fix NULL support in attribute
-	editor git-svn-id: http://svn.osgeo.org/qgis/trunk@15057
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-18  jef 
-
-	* src/providers/wfs/qgswfsprovider.cpp: fix #3424 git-svn-id: http://svn.osgeo.org/qgis/trunk@15056
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-17  jef 
-
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/qgsattributedialog.cpp,
-	src/app/qgsattributetypeloaddialog.cpp, src/app/qgsclipboard.cpp,
-	src/app/qgsoptions.cpp, src/gui/qgsattributeeditor.cpp,
-	src/gui/qgsattributeeditor.h, src/ui/qgsoptionsbase.ui: [FEATURE]
-	feature form updates: - make NULL value string representation configurable - fix feature updates in feature form from attribute table - add support for NULL values in value maps (comboboxes) - use layer names instead of ids in drop down list when loading
-	  value maps from layers.  - support feature form expression fields: line edits on the form   which name prefix "expr_" are evaluated.  Their value is
-	  interpreted as field calculator string and replaced with the
-	calculated value.  - support search for NULL in attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@15054
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2011-01-17  pcav 
-
-	* i18n/qgis_it.ts, src/plugins/grass/modules-6.4/default.qgc: Minor
-	improvements in IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15053
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use OGRSpatialReferenceH instead of void pointer
 
-2011-01-15  brushtyler 
+Merge: bb5c471 96887b8
+Nathan Woodrow 	2013-03-12
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/doRasterize.py: allowing unicode
-	error messages git-svn-id: http://svn.osgeo.org/qgis/trunk@15051
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #467 from 3nids/immutablefields
+    
+    [fix #7332] enables fields edition for newly added layers
 
-2011-01-14  jef 
+Denis Rouzaud 	2013-03-13
 
-	* src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h,
-	src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h,
-	src/gui/qgsmapoverviewcanvas.cpp, src/gui/qgsmapoverviewcanvas.h: 
-	fix #2884: crashed when two map renderers are simultaneously
-	rendering the layers for the canvas and overview (eg. on resize,
-	when overview is docked).  This might fix it.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15050
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7332
 
-2011-01-14  jef 
+Larry Shaffer 	2013-03-12
 
-	* src/plugins/ogr_converter/translator.cpp: fix warning & typo git-svn-id: http://svn.osgeo.org/qgis/trunk@15049
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Revert unnecessary disabling of unknown warnings
 
-2011-01-14  jef 
+Larry Shaffer 	2013-03-12
 
-	* src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	fix enumeration parsing git-svn-id: http://svn.osgeo.org/qgis/trunk@15048
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Rotate Feature action to edit menu
 
-2011-01-14  jef 
+Larry Shaffer 	2013-03-12
 
-	* src/gui/qgsmapcanvas.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@15047
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set custom QGIS-style group boxes as default on Mac
+    
+    - Mac Qt-style group boxes have issues that need addressed by Qt
 
-2011-01-14  ddehaan 
+Larry Shaffer 	2013-03-06
 
-	* src/providers/sqlanywhere/qgssqlanywhereprovider.h: Fixed typo
-	returning max attribute value in SQLA provider.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15046
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add function to collapsible group box's to fix visual issues during collapse and expand
+    
+    - Update QgsCollapsibleGroupBox for basic Mac style
 
-2011-01-14  ddehaan 
+Larry Shaffer 	2013-03-12
 
-	* src/providers/sqlanywhere/qgssqlanywhereprovider.cpp: Changed SQLA
-	provider to output WKB format 1.1 instead of 1.2.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15045
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove extra horizontal line from composer item properties
+    
+    - Suggested by Olivier Dalang
 
-2011-01-14  mhugent 
+Juergen E. Fischer 	2013-03-13
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgsgetrequesthandler.h,
-	src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgshttprequesthandler.h,
-	src/mapserver/qgsrequesthandler.h,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgssoaprequesthandler.h,
-	src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: 
-	Consistent handling of outputformat in mapserver and better error
-	handling git-svn-id: http://svn.osgeo.org/qgis/trunk@15044
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2011-01-14  pcav 
+Merge: a05747c 3b8cbc2
+Nyall Dawson 	2013-03-13
 
-	* i18n/qgis_it.ts: More minor improvements in IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15043
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge heatmap_fixes branch
 
-2011-01-14  mhugent 
+Nyall Dawson 	2013-03-13
 
-	* src/ui/qgsattributeselectiondialogbase.ui: Add scroll area to
-	composer table attribute selection dialog. Fix for bug #3406 git-svn-id: http://svn.osgeo.org/qgis/trunk@15042
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Convert radius to a float, not an integer. Fixes heatmaps created with a radius < 1.
 
-2011-01-14  mhugent 
+Merge: 1164c81 a56c957
+Nyall Dawson 	2013-03-13
 
-	* python/core/qgscomposerlabel.sip,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlabel.h,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h, src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssldparser.h, src/mapserver/qgswmsserver.cpp: Add a
-	label id to distinguish different composer labels. Allow label
-	string replacement in GetPrint request of qgis server and return
-	more verbose error messages git-svn-id: http://svn.osgeo.org/qgis/trunk@15041
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into heatmap_fixes
 
-2011-01-14  mhugent 
+Nyall Dawson 	2013-03-13
 
-	* src/core/composer/qgscomposermap.cpp: Safer generation of ids for
-	composer map git-svn-id: http://svn.osgeo.org/qgis/trunk@15040
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add option to select kernel shape (quartic, triangular or uniform) in heatmap plugin
 
-2011-01-14  pcav 
+Marco Bernasocchi 	2013-03-12
 
-	* i18n/qgis_it.ts: More minor improvements in IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15039
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix typedef void *OGR issues
 
-2011-01-13  macho 
+Victor Olaya 	2013-03-12
 
-	* i18n/qgis_fr.ts: translation update: fr by JRM git-svn-id: http://svn.osgeo.org/qgis/trunk@15038
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed problem in Split RGB bands algorithm
 
-2011-01-13  jef 
+Victor Olaya 	2013-03-12
 
-	* src/providers/postgres/qgspostgresprovider.cpp: followup on
-	r15028: more postgis st_ fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@15037
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante]fixed #7330
 
-2011-01-13  jef 
+Victor Olaya 	2013-03-12
 
-	* src/core/qgsdatasourceuri.cpp,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: fix #3401 git-svn-id: http://svn.osgeo.org/qgis/trunk@15036
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added multiband check in SAGA algorithms
 
-2011-01-13  mhugent 
+Marco Hugentobler 	2013-03-12
 
-	* src/app/qgisapp.cpp: Fix for restoring selection color from
-	project. Fixes bug #3400 git-svn-id: http://svn.osgeo.org/qgis/trunk@15034
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use double instead of qreal also on non-Android
 
-2011-01-13  pcav 
+Marco Bernasocchi 	2013-03-12
 
-	* i18n/qgis_it.ts: Very minor improvements in it GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15033
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix qreal vs double issues
 
-2011-01-13  pcav 
+Marco Bernasocchi 	2012-09-06
 
-	* i18n/qgis_it.ts: Minor improvements in it GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15032
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    removing obsolete qtmain_android.cpp
 
-2011-01-13  mhugent 
+Marco Hugentobler 	2013-03-12
 
-	* src/mapserver/qgsconfigparser.cpp: Remove map items not referenced
-	in the GetPrint request git-svn-id: http://svn.osgeo.org/qgis/trunk@15031
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Distance unit for vector field symbol layer
 
-2011-01-13  mhugent 
+Marco Hugentobler 	2013-03-12
 
-	* src/mapserver/qgsprojectparser.cpp: Fix usage of composer legend
-	in mapserver print git-svn-id: http://svn.osgeo.org/qgis/trunk@15030
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Emit changed signal in unit combo box slots
 
-2011-01-13  pcav 
+Marco Hugentobler 	2013-03-12
 
-	* i18n/qgis_it.ts: Minor edit of IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15029
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Possibility to specify several output units for font marker and ellipse symbol layers
 
-2011-01-13  jef 
+Marco Hugentobler 	2013-03-12
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: fix r15023: restore
-	use of geometrytype as it's not deprecated and use different
-	geometry type notation git-svn-id: http://svn.osgeo.org/qgis/trunk@15028
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Output unit for svg marker
 
-2011-01-12  jef 
+Nyall Dawson 	2013-03-12
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@15025
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Rename Quantile classifier to 'Quantile (Equal Count)', to aid transitions from MapInfo to QGIS.
 
-2011-01-12  jef 
+Nyall Dawson 	2013-03-12
 
-	* debian/control: revert debian/control change git-svn-id: http://svn.osgeo.org/qgis/trunk@15024
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move decay radio widget into advanced group box, and set the default value to 0. This method of controlling the kernel shape is non-standard, and should be achieved instead by giving users a choice of standard kernel functions.
 
-2011-01-12  jef 
+Victor Olaya 	2013-03-11
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/plugins/spit/qgsshapefile.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: update postgis
-	support to use st_ variants instead of old deprecated (and now
-	removed) versions.  git-svn-id: http://svn.osgeo.org/qgis/trunk@15023
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed #7324
 
-2011-01-12  jef 
+Victor Olaya 	2013-03-11
 
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/core/spatialite/spatialite.c,
-	src/plugins/gps_importer/qgsgpsplugin.cpp: fix typos git-svn-id: http://svn.osgeo.org/qgis/trunk@15022
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] edited GRASS descriptions
 
-2011-01-12  pcav 
+Victor Olaya 	2013-03-11
 
-	* debian/control, i18n/qgis_it.ts: Typo in IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@15021
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed #7318
 
-2011-01-12  mhugent 
+Juergen E. Fischer 	2013-03-11
 
-	* src/mapserver/qgsprojectparser.cpp: Fix for wms server print. Add
-	composer pictures after the composer maps git-svn-id: http://svn.osgeo.org/qgis/trunk@15020
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    support embedding of spatialite layers on relative paths
 
-2011-01-12  mhugent 
+Juergen E. Fischer 	2013-03-09
 
-	* src/app/qgslabelpropertydialog.cpp: Add missing handler in label
-	property dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@15019
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix QgsPalettedRasterRenderer sip binding
 
-2011-01-11  jef 
+Juergen E. Fischer 	2013-03-09
 
-	* src/app/attributetable/qgsattributetabledelegate.cpp: fix #3313 git-svn-id: http://svn.osgeo.org/qgis/trunk@15018
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    oracle provider: switch to OCICollGetElemArray
 
-2011-01-11  macho 
+Marco Hugentobler 	2013-03-11
 
-	* i18n/qgis_hr_HR.ts: translation update: croatian by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@15017
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Output unit for simple marker
 
-2011-01-11  mhugent 
+Sandro Santilli 	2013-03-11
 
-	* python/core/qgscomposerscalebar.sip,
-	src/core/composer/qgscomposerscalebar.cpp,
-	src/core/composer/qgscomposerscalebar.h,
-	src/gui/qgscomposerview.cpp: Apply only default size (not all other
-	default settings) when adding scalebar to composer view git-svn-id: http://svn.osgeo.org/qgis/trunk@15016
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Rename staged plugin install rules to use dashes, not underscores
+    
+    See http://lists.osgeo.org/pipermail/qgis-developer/2013-March/024759.html
 
-2011-01-10  jef 
+Marco Hugentobler 	2013-03-11
 
-	* python/CMakeLists.txt, python/pyspatialite/CMakeLists.txt,
-	python/pyspatialite/LICENSE, python/pyspatialite/lib/__init__.py,
-	python/pyspatialite/lib/dbapi2.py, python/pyspatialite/lib/dump.py,
-	python/pyspatialite/src/cache.c, python/pyspatialite/src/cache.h,
-	python/pyspatialite/src/connection.c,
-	python/pyspatialite/src/connection.h,
-	python/pyspatialite/src/cursor.c, python/pyspatialite/src/cursor.h,
-	python/pyspatialite/src/microprotocols.c,
-	python/pyspatialite/src/microprotocols.h,
-	python/pyspatialite/src/module.c, python/pyspatialite/src/module.h,
-	python/pyspatialite/src/prepare_protocol.c,
-	python/pyspatialite/src/prepare_protocol.h,
-	python/pyspatialite/src/row.c, python/pyspatialite/src/row.h,
-	python/pyspatialite/src/sqlitecompat.h,
-	python/pyspatialite/src/statement.c,
-	python/pyspatialite/src/statement.h,
-	python/pyspatialite/src/util.c, python/pyspatialite/src/util.h: add
-	'internal' pyspatialite git-svn-id: http://svn.osgeo.org/qgis/trunk@15015
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Output units for line decoration symbol layer
 
-2011-01-10  jef 
+Marco Hugentobler 	2013-03-11
 
-	* src/gui/qgsmapcanvas.cpp: fix #3399 git-svn-id: http://svn.osgeo.org/qgis/trunk@15013
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Output units for marker line properties
 
-2011-01-09  kyngchaos 
+Larry Shaffer 	2013-03-10
 
-	* mac/cmake/2lib.cmake.in: remove debug message git-svn-id: http://svn.osgeo.org/qgis/trunk@15012
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #7307, project Save function not correctly adding path to Open Recent Projects menu
+    
+    - Did work for Save As.., but not Save
+    - Add 5 second timeout for 'Saved project to: ' status bar message for Save and Save As..
 
-2011-01-09  kyngchaos 
+Victor Olaya 	2013-03-10
 
-	* cmake/MacBundleMacros.cmake, mac/cmake/2lib.cmake.in: libpq may
-	link libintl git-svn-id: http://svn.osgeo.org/qgis/trunk@15011
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] R algorithms now use raster package by default
 
-2011-01-09  pcav 
+Victor Olaya 	2013-03-10
 
-	* src/plugins/grass/modules-6.4/v.in.gns.1.svg: Revert symlinks git-svn-id: http://svn.osgeo.org/qgis/trunk@15007
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] improved automated test-creation tools
 
-2011-01-09  pcav 
+Victor Olaya 	2013-03-10
 
-	* src/plugins/grass/modules-6.4/v.in.gns.1.png: Changed several
-	GRASS icons (thanks Robert Szczepanek), first test with symlinks git-svn-id: http://svn.osgeo.org/qgis/trunk@15006
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added ParameterFile in modeler
 
-2011-01-07  jef 
+Victor Olaya 	2013-03-10
 
-	* src/app/qgsmaptoolselectrectangle.cpp,
-	src/app/qgsmaptoolselectutils.cpp: fix #3246 git-svn-id: http://svn.osgeo.org/qgis/trunk@15004
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] divided v.split in two different modules
 
-2011-01-06  jef 
+Victor Olaya 	2013-03-10
 
-	* debian/qgis-sqlanywhere{QGIS_ABI}.install,
-	src/plugins/sqlanywhere/CMakeLists.txt: fix sql anywhere plugin and
-	debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@15003
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed #7297
 
-2011-01-06  kyngchaos 
+Marco Hugentobler 	2013-03-10
 
-	* src/providers/sqlanywhere/CMakeLists.txt: forgot to rename link
-	side (r14500) git-svn-id: http://svn.osgeo.org/qgis/trunk@15002
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Full support for width/offset/dash units in simple line symbollayer
 
-2011-01-06  pcav 
+Merge: 0c1faa5 247980b
+Nathan Woodrow 	2013-03-10
 
-	* i18n/qgis_it.ts: Typo in it GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@15001
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #455 from 3nids/immutablefields
+    
+    [Feature #6562] add editable option for all edit types
 
-2011-01-06  kyngchaos 
+Werner Macho 	2013-03-10
 
-	* src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt: prefix
-	library name with 'qgis' like other provider support libraries (ie
-	grass); add OSX properties git-svn-id: http://svn.osgeo.org/qgis/trunk@15000
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: gl_ES by Xan
 
-2011-01-05  wonder 
+Victor Olaya 	2013-03-10
 
-	* python/console.py: Added clearConsole() to Python console.
-	Contributed by Nathan Woodrow - thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14999
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] modifed behaviour of 'log' tab in execution dialog
 
-2011-01-05  wonder 
+Victor Olaya 	2013-03-10
 
-	* python/console.py: Docking of Python console - contributed by
-	Nathan Woodrow - with some improvements.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14998
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed #7295
 
-2011-01-05  pcav 
+Larry Shaffer 	2013-03-08
 
-	* i18n/qgis_it.ts: Updated it GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14997
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #7289, add CMake option to enable building with Qt jom (nmake) on Windows
+    
+    - Can now compile using NMake with jom directly from QtCreator using MSVC compiler (2008) and OSGeo4W devel libs
+    - Make app capable of running from build directory
+    - Caveat: may be better way to do it; could have better warning control
 
-2011-01-05  gsherman 
+Werner Macho 	2013-03-09
 
-	* python/console.py: Revert "Adding docking support to python
-	console" This reverts commit f371465e122e525e3e3b10038090bb29be0d0ab7.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14996
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: danish by Jacob
 
-2011-01-05  gsherman 
+Sandro Santilli 	2013-03-08
 
-	* src/app/qgsfeatureaction.cpp: Default the
-	disable_enter_attribute_values_dialog value to false for users that
-	have not set this option. This keeps it in sync with the checkbox in
-	the options dialog that, by default, is unchecked.  Previously on a
-	new install the attribute dialog doesn't appear, leaving users
-	confused about how to enter attribute information.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14995
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WMS provider: protect from simple redirect loops in GetCapabilities
+    
+    See http://hub.qgis.org/issues/3457
 
-2011-01-05  gsherman 
+Larry Shaffer 	2013-03-08
 
-	* python/console.py: Adding docking support to python console git-svn-id: http://svn.osgeo.org/qgis/trunk@14994
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for older compilers, like on default Mac setup
 
-2011-01-04  pcav 
+Nathan Woodrow 	2013-03-08
 
-	* : New db.* GRASS modules icons - Thanks Robert Szczepanek git-svn-id: http://svn.osgeo.org/qgis/trunk@14993
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Expose dialog created by QgsAttributeDialog to iface
 
-2011-01-04  mhugent 
+Radim Blazek 	2013-03-08
 
-	* src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolmeasureangle.h, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsmeasuredialog.h, src/core/qgsmaprenderer.h,
-	src/ui/qgsdisplayanglebase.ui, src/ui/qgsmeasurebase.ui: Apply patch
-	#3384 by Sergey Yakushev with few modifications. Mark
-	QgsMapRenderer::distanceArea as deprecated git-svn-id: http://svn.osgeo.org/qgis/trunk@14992
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    enabled identify results context menu for rasters, zoom to feature, copy feature, copy GetFeatureInfo url
 
-2011-01-02  macho 
+Marco Hugentobler 	2013-03-08
 
-	* i18n/qgis_fr.ts,
-	resources/context_help/QgsVectorLayerProperties-fr_FR,
-	resources/context_help/QgsWMSSourceSelect-fr_FR: translation update:
-	fr updates by JRM and Mehdi SEMCHAOUI git-svn-id: http://svn.osgeo.org/qgis/trunk@14990
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix check state for legend groups restored from project file
 
-2010-12-31  jef 
+Merge: b9f3da6 290f8fd
+Nyall Dawson 	2013-03-08
 
-	* ms-windows/QGIS-Installer.nsi: catch necessary reboot from OSGeo4W
-	postinstall scripts git-svn-id: http://svn.osgeo.org/qgis/trunk@14989
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into heatmap_fixes
 
-2010-12-31  jef 
+Martin Dobias 	2013-03-08
 
-	* python/CMakeLists.txt, python/core/conversions.sip: fix #3378 git-svn-id: http://svn.osgeo.org/qgis/trunk@14988
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Moved GML import/export to a new class: QgsOgcUtils
 
-2010-12-31  mhugent 
+Larry Shaffer 	2013-03-07
 
-	* src/gui/qgsmapcanvas.cpp: Update item positions explicitely in
-	zoom previous / zoom next. Fixes part of bug #3369 git-svn-id: http://svn.osgeo.org/qgis/trunk@14987
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    On Mac use Close for quit action (conflicts with app menu's quit action and key sequence)
 
-2010-12-31  macho 
+Larry Shaffer 	2013-03-06
 
-	* i18n/qgis_pt_PT.ts: translation update: pt_PT by Duarte Carreira git-svn-id: http://svn.osgeo.org/qgis/trunk@14986
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Keep composer multi-item selection only when Shift is pressed during click
+    
+    - Fixes issues where Shift was still registered as pressed when shift click happened outside of view (due to lingering keyboard focus)
 
-2010-12-31  macho 
+Larry Shaffer 	2013-03-07
 
-	* i18n/qgis_cs_CZ.ts: translations update: cz by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@14985
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #7287, keep composer listings sorted in menus and manager
 
-2010-12-30  kyngchaos 
+Werner Macho 	2013-03-07
 
-	* cmake/FindGDAL.cmake, cmake/FindGEOS.cmake: Fix empty _LIBRARY
-	left from framework check when fw not found git-svn-id: http://svn.osgeo.org/qgis/trunk@14984
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: danish by Jacob
 
-2010-12-30  jef 
+Marco Hugentobler 	2013-03-07
 
-	* src/plugins/ogr_converter/translator.cpp: fix #3377 git-svn-id: http://svn.osgeo.org/qgis/trunk@14983
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Separate units for line width, line offset, dash pattern
 
-2010-12-29  macho 
+Merge: 90b66dc 0b6fcda
+volaya 	2013-03-07
 
-	* TRANSLATORS: added new persian translator to TRANSLATORS file git-svn-id: http://svn.osgeo.org/qgis/trunk@14981
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #462 from MatMatt/master
+    
+    [sextante] R scripts can now have empty lines
 
-2010-12-29  macho 
+Matteo Mattiuzzi 	2013-03-07
 
-	* i18n/qgis_fa.ts: translation update: fa by mola git-svn-id: http://svn.osgeo.org/qgis/trunk@14980
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    R-scripts can have up to 10 consecutive empty lines before the parser exits
 
-2010-12-28  jef 
+Merge: 0a25aad 7db1b60
+mhugent 	2013-03-06
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/core/composer/qgscomposerpicture.cpp,
-	src/core/composer/qgslegendmodel.cpp: fix #3363 git-svn-id: http://svn.osgeo.org/qgis/trunk@14979
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #454 from Oslandia/atlas
+    
+    refs #7263
 
-2010-12-27  wonder 
+olivierdalang 	2013-03-01
 
-	* python/core/qgsfeature.sip, python/core/qgsvectorlayer.sip,
-	src/core/qgsvectorlayer.h: PyQGIS fixes: added few typedefs (IIRC
-	they were not supported by some old SIP versions) and added missing
-	signals in QgsVectorLayer git-svn-id: http://svn.osgeo.org/qgis/trunk@14978
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    change "paste in place" shortcut to ctrl+shift+V
 
-2010-12-27  brushtyler 
+olivierdalang 	2013-02-26
 
-	* python/plugins/GdalTools/tools/extentSelector.py: fixed minor
-	issue refreshing extent git-svn-id: http://svn.osgeo.org/qgis/trunk@14977
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Feature] Paste in place in the composer using ctrl+alt+v.
 
-2010-12-27  brushtyler 
+Marco Hugentobler 	2013-03-07
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doClipper.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/extentSelector.py,
-	python/plugins/GdalTools/tools/extentSelector.ui,
-	python/plugins/GdalTools/tools/widgetClipper.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui: define extent for grid
-	analisys, to fix #3332 git-svn-id: http://svn.osgeo.org/qgis/trunk@14976
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Modify testqgsscalecombobox to match modified behaviour of QgsScaleComboBox
 
-2010-12-27  macho 
+Nyall Dawson 	2013-03-07
 
-	* i18n/qgis_fa.ts: translation update: adding persian language on
-	request git-svn-id: http://svn.osgeo.org/qgis/trunk@14975
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Automatically set the projection on output raster to match input layer
 
-2010-12-24  mhugent 
+Nyall Dawson 	2013-03-06
 
-	* src/mapserver/qgsconfigparser.cpp, src/mapserver/qgssldparser.cpp: 
-	Remove obsolete comments git-svn-id: http://svn.osgeo.org/qgis/trunk@14974
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Refactor to avoid creating multiple QgsDistanceArea objects and recalculation of static or unused variables. Results in massive speed increase and fixes #6756, #6691 and #6692.
 
-2010-12-24  mhugent 
+Victor Olaya 	2013-03-06
 
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgsgetrequesthandler.h,
-	src/mapserver/qgsmslayercache.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h,
-	src/mapserver/qgsrequesthandler.h, src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssldparser.h,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgssoaprequesthandler.h,
-	src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: 
-	[FEATURE]: initial support for wms printing with GetPrint-Request git-svn-id: http://svn.osgeo.org/qgis/trunk@14973
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed #7251
 
-2010-12-24  mhugent 
+Victor Olaya 	2013-03-06
 
-	* src/core/composer/qgscomposerpicture.cpp,
-	src/core/composer/qgscomposerpicture.h: Apply patch #3295 to draw
-	SVG composer pictures as vectors, provided by JD git-svn-id: http://svn.osgeo.org/qgis/trunk@14972
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #7277
 
-2010-12-23  macho 
+Victor Olaya 	2013-03-01
 
-	* i18n/qgis_el_GR.ts: translation update: gr by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@14971
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] improvements in test tools
 
-2010-12-22  pcav 
+Denis Rouzaud 	2013-03-06
 
-	* i18n/qgis_it.ts, src/plugins/grass/modules-common/r.watershed.qgm: 
-	Minor improvements to GRASS messages git-svn-id: http://svn.osgeo.org/qgis/trunk@14970
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    switched default and ok arguments
 
-2010-12-22  borysiasty 
+Denis Rouzaud 	2013-03-06
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14964
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added default value argument for readEntryList
 
-2010-12-22  brushtyler 
+Martin Dobias 	2013-03-06
 
-	* python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doBuildVRT.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/doPctRgb.py,
-	python/plugins/GdalTools/tools/doProjection.py,
-	python/plugins/GdalTools/tools/doRgbPct.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/widgetBatchBase.py,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui: create VRT with
-	recurse scan of dirs, to fix #3095 some code cleanup, updated labels
-	when in batch mode to follow up the QGis HIG guideline git-svn-id: http://svn.osgeo.org/qgis/trunk@14963
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improved support for parsing of GML2, added some autotests
 
-2010-12-21  mhugent 
+Martin Dobias 	2013-03-05
 
-	* src/providers/wfs/qgswfsprovider.cpp: Enhance precision for wfs-t
-	coordinates if srs is in degrees. Fixes bug #3358 git-svn-id: http://svn.osgeo.org/qgis/trunk@14961
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Map layer registry: un-deprecated addMapLayer(), added removeMapLayer() for convenience
 
-2010-12-21  pcav 
+Martin Dobias 	2013-03-05
 
-	* debian/control: Revert accidental changes to debian/control git-svn-id: http://svn.osgeo.org/qgis/trunk@14959
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added option to load newly exported OpenStreetMap layer to canvas
 
-2010-12-21  pcav 
+Martin Dobias 	2013-03-05
 
-	* src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-common/v.in.ogr.all.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.all.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgm: Minor improvements to
-	GRASS modules git-svn-id: http://svn.osgeo.org/qgis/trunk@14958
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Define OpenStreetMap actions in .ui file and make Vector menu permanent
 
-2010-12-21  mhugent 
+Merge: 2f53505 6d1eb26
+Nathan Woodrow 	2013-03-05
 
-	* src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Fix patch #14951. Read/Write
-	auto update to xml, initialize mAutoUpdate and guard against
-	multiple connections git-svn-id: http://svn.osgeo.org/qgis/trunk@14957
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #448 from szekerest/master
+    
+    MSSQL Fixes (Fix #6733 and Fix #7254)
 
-2010-12-21  timlinux 
+szekerest 	2013-03-05
 
-	* src/app/qgsdisplayangle.cpp, src/app/qgsdisplayangle.h,
-	src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolmeasureangle.h, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsmeasuredialog.h, src/ui/qgsdisplayanglebase.ui,
-	src/ui/qgsmeasurebase.ui: Applied patch from ticket #3240 with some
-	tweaks. Allows unprojected measurement of distances git-svn-id: http://svn.osgeo.org/qgis/trunk@14956
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix the behaviour of the trusted connection checkbox (#6262)
 
-2010-12-21  pcav 
+Werner Macho 	2013-03-05
 
-	* debian/control, i18n/qgis_it.ts: Updated IT GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@14955
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: romanian language
 
-2010-12-21  macho 
+Merge: a976ecb ba91c8f
+Nathan Woodrow 	2013-03-04
 
-	* i18n/qgis_pt_PT.ts: translation update: pt by Alexandre Neto git-svn-id: http://svn.osgeo.org/qgis/trunk@14954
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #458 from 3nids/respectUIimmutableoption
+    
+    respect the disabled option defined in the UI file
 
-2010-12-21  cfarmer 
+Denis Rouzaud 	2013-03-05
 
-	* python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/frmSpatialJoin.ui: Adds median value to
-	summary when joining layers with numeric data git-svn-id: http://svn.osgeo.org/qgis/trunk@14953
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    respect the disabled option defined in the UI file
 
-2010-12-21  timlinux 
+Denis Rouzaud 	2013-03-05
 
-	* ms-windows/quickpackage.sh: Fix spelling error git-svn-id: http://svn.osgeo.org/qgis/trunk@14952
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    keep coding consistent
 
-2010-12-21  timlinux 
+Merge: 7c0746b b4aaa19
+Nathan Woodrow 	2013-03-04
 
-	* src/app/CMakeLists.txt,
-	src/app/composer/qgscomposerlegendlayersdialog.cpp,
-	src/app/composer/qgscomposerlegendlayersdialog.h,
-	src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h,
-	src/ui/qgscomposerlegendlayersdialogbase.ui,
-	src/ui/qgscomposerlegendwidgetbase.ui: applied patch from NathanW
-	for ticket #3339 git-svn-id: http://svn.osgeo.org/qgis/trunk@14951
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #457 from nyalldawson/gradfixes
+    
+    Allow long/bigint columns to be used for graduated symbology (Fix #4593)
 
-2010-12-21  timlinux 
+Nyall Dawson 	2013-03-05
 
-	* ms-windows/quickpackage.sh: fix var that needed to be hard coded git-svn-id: http://svn.osgeo.org/qgis/trunk@14950
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow long/bigint columns to be used for graduated symbology (#4593)
 
-2010-12-21  timlinux 
+Merge: ea0c87e 58a7edb
+Nathan Woodrow 	2013-03-04
 
-	* ms-windows/quickpackage.sh: fix var that needed to be hard coded git-svn-id: http://svn.osgeo.org/qgis/trunk@14949
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #453 from nyalldawson/gradfixes
+    
+    Don't treat null values as zero for graduated symbology (Fix #6096)
 
-2010-12-20  brushtyler 
+Larry Shaffer 	2013-03-03
 
-	* python/plugins/GdalTools/tools/doBuildVRT.py,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui: Added separate
-	option to BuildVRT tool, to fix #3180 git-svn-id: http://svn.osgeo.org/qgis/trunk@14939
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #7195, transparency options in composer should be 0-100%
 
-2010-12-20  brushtyler 
+Denis Rouzaud 	2013-03-04
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doProximity.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: allow multiple values
-	in proximity tool, allow multiple no-data values in warp tool, fixed
-	error in retrieving srs git-svn-id: http://svn.osgeo.org/qgis/trunk@14938
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] add editable option for all edit types
 
-2010-12-20  brushtyler 
+Hugo Mercier 	2013-03-04
 
-	* src/providers/spatialite/qgsspatialiteprovider.cpp: Fix #3356 git-svn-id: http://svn.osgeo.org/qgis/trunk@14937
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    refs #7263
+    refs #6856
+    Reset QPrinter to circumvent PDF corruption bug
 
-2010-12-17  mhugent 
+Juergen E. Fischer 	2013-03-04
 
-	* src/app/legend/qgslegendlayer.cpp: Little fix for more efficient
-	refresh after editing a lot of features (e.g. deleting many features
-	at once) git-svn-id: http://svn.osgeo.org/qgis/trunk@14936
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    30c7ec40 also applies to mingw
 
-2010-12-17  jef 
+Marco Hugentobler 	2013-03-04
 
-	* python/core/qgsvectordataprovider.sip,
-	src/app/qgsquerybuilder.cpp, src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: allow vector data
-	provider to record errors (currently only used in query builder to
-	report errors in where clauses from OGR and postgres provider).  git-svn-id: http://svn.osgeo.org/qgis/trunk@14935
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consider avoid intersection settings when pasting features
 
-2010-12-16  wonder 
-
-	* src/app/legend/qgslegend.cpp: Fixed a crash when refreshing layer
-	symbology - if the currently selected item has been removed (#3326
-	and #3003) git-svn-id: http://svn.osgeo.org/qgis/trunk@14934
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-04
 
-2010-12-16  wonder 
+    Use isNull() to test for null attribute values
 
-	* src/ui/qgscategorizedsymbolrendererv2widget.ui,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui: Enabled sorting of
-	classes (#3322) git-svn-id: http://svn.osgeo.org/qgis/trunk@14933
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-04
 
-2010-12-16  wonder 
+    Use isEmpty() to test for null values
 
-	* src/core/qgssearchtreenode.cpp,
-	src/core/qgsvectordataprovider.cpp, src/core/qgsvectorlayer.cpp: Use
-	case insensitive comparison for column names. Fixes #3298 git-svn-id: http://svn.osgeo.org/qgis/trunk@14932
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nyall Dawson 	2013-03-04
 
-2010-12-16  macho 
+    Don't treat null values as zero for graduated symbology
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14931
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-03-03
 
-2010-12-16  jef 
+    german translation update
 
-	* i18n/qgis_de.ts, src/plugins/sqlanywhere/sasourceselect.cpp: fix
-	#3344 git-svn-id: http://svn.osgeo.org/qgis/trunk@14930
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-16  jef 
-
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/providers/wms/qgswmsprovider.cpp: fix #3343 git-svn-id: http://svn.osgeo.org/qgis/trunk@14929
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-16  jef 
-
-	* src/providers/wms/qgswmsprovider.cpp: don't overwrite wms error
-	messages git-svn-id: http://svn.osgeo.org/qgis/trunk@14928
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-16  jef 
-
-	* src/core/qgsmaplayerregistry.cpp: fix crash on quit git-svn-id: http://svn.osgeo.org/qgis/trunk@14926
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-16  jef 
-
-	* resources/context_help/SaNewConnection-de_DE,
-	resources/context_help/SaSourceSelect-de_DE: german translation of
-	sql anywhere online help git-svn-id: http://svn.osgeo.org/qgis/trunk@14925
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-16  jef 
-
-	* debian/changelog, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.natty,
-	debian/control.squeeze, debian/qgis-providers.install,
-	debian/qgis-sqlanywhere{QGIS_ABI}.install, debian/qgis.install,
-	src/analysis/raster/qgsrastercalclexer.ll,
-	src/app/composer/qgscomposer.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/ui/qgsstylev2managerdialogbase.ui: debian packaging fix:
-	separate sql anywhere package, fix lenny build (Qt<4.5) git-svn-id: http://svn.osgeo.org/qgis/trunk@14924
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14923
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  jef 
-
-	* src/plugins/sqlanywhere/CMakeLists.txt,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.cpp,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.h,
-	src/plugins/sqlanywhere/sadbtablemodel.cpp,
-	src/plugins/sqlanywhere/sadbtablemodel.h,
-	src/plugins/sqlanywhere/salayer.h,
-	src/plugins/sqlanywhere/sanewconnection.cpp,
-	src/plugins/sqlanywhere/sanewconnection.h,
-	src/plugins/sqlanywhere/saquerybuilder.cpp,
-	src/plugins/sqlanywhere/saquerybuilder.h,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.h,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.h,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.h,
-	src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapi.h,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapidll.c,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapidll.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.h: sql
-	anywhere: fix warnings (and obligatory reindentation (using
-	scripts/prepare-commit.sh) git-svn-id: http://svn.osgeo.org/qgis/trunk@14922
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  jef 
-
-	* src/gui/symbology-ng/qgsstylev2managerdialog.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14921
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  jef 
-
-	* debian/changelog, debian/qgis-providers.install,
-	debian/qgis.install: include sqlanywhere plugin in debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@14920
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  brushtyler 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: use both schema
-	and table name retrieving oid, to fix #3329 fixed endian deduction
-	corrupted in r13340 git-svn-id: http://svn.osgeo.org/qgis/trunk@14919
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  ddehaan 
-
-	* resources/context_help/SaNewConnection-en_US,
-	resources/context_help/SaSourceSelect-en_US,
-	src/plugins/CMakeLists.txt, src/plugins/sqlanywhere/CMakeLists.txt,
-	src/plugins/sqlanywhere/LICENSE,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.cpp,
-	src/plugins/sqlanywhere/sadbfilterproxymodel.h,
-	src/plugins/sqlanywhere/sadbtablemodel.cpp,
-	src/plugins/sqlanywhere/sadbtablemodel.h,
-	src/plugins/sqlanywhere/salayer.h,
-	src/plugins/sqlanywhere/sanewconnection.cpp,
-	src/plugins/sqlanywhere/sanewconnection.h,
-	src/plugins/sqlanywhere/sanewconnectionbase.ui,
-	src/plugins/sqlanywhere/saquerybuilder.cpp,
-	src/plugins/sqlanywhere/saquerybuilder.h,
-	src/plugins/sqlanywhere/sasourceselect.cpp,
-	src/plugins/sqlanywhere/sasourceselect.h,
-	src/plugins/sqlanywhere/sasourceselectbase.ui,
-	src/plugins/sqlanywhere/sqlanywhere.cpp,
-	src/plugins/sqlanywhere/sqlanywhere.h,
-	src/plugins/sqlanywhere/sqlanywhere.qrc,
-	src/providers/CMakeLists.txt,
-	src/providers/sqlanywhere/CMakeLists.txt,
-	src/providers/sqlanywhere/LICENSE,
-	src/providers/sqlanywhere/load_alaska_shapes.sql,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.cpp,
-	src/providers/sqlanywhere/qgssqlanywhereprovider.h,
-	src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapi.h,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapidll.c,
-	src/providers/sqlanywhere/sqlanyconnection/sacapi/sacapidll.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.h,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp,
-	src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.h: 
-	Contributing a native SQL Anywhere plugin+provider git-svn-id: http://svn.osgeo.org/qgis/trunk@14918
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  macho 
-
-	* TRANSLATORS: added some new translators git-svn-id: http://svn.osgeo.org/qgis/trunk@14916
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-15  macho 
-
-	* i18n/qgis_pt_PT.ts: translation update: pt by giovanni git-svn-id: http://svn.osgeo.org/qgis/trunk@14915
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  wonder 
-
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Rotate also
-	marker's offset, not just the marker itself (fixes #3334) git-svn-id: http://svn.osgeo.org/qgis/trunk@14914
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  wonder 
-
-	* images/images.qrc,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/ui/qgsstylev2managerdialogbase.ui: Better style manager dialog
-	with icons from Robert Szczepanek.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14913
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  macho 
-
-	* i18n/qgis_is.ts: translation update: .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14912
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  wonder 
-
-	* python/core/qgsdataprovider.sip: PyQIS: subclassing code for
-	QgsDataProvider git-svn-id: http://svn.osgeo.org/qgis/trunk@14911
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  mhugent 
-
-	* src/app/composer/qgscomposer.cpp: Set view box for svg export
-	explicitely (thanks to JD) git-svn-id: http://svn.osgeo.org/qgis/trunk@14910
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  mhugent 
-
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/app/qgisapp.cpp: Notify plugins about composer addition /
-	deletion also when loading a composer template git-svn-id: http://svn.osgeo.org/qgis/trunk@14909
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-14  macho 
-
-	* i18n/qgis_is.ts, i18n/qgis_pt_PT.ts: translation update: pt by
-	giovanni and is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14908
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  mhugent 
-
-	* src/core/qgspallabeling.cpp: Write / read strikeout and underline
-	for label-ng. Fixes bug #3323 git-svn-id: http://svn.osgeo.org/qgis/trunk@14905
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  wonder 
-
-	* src/core/qgsgeometry.cpp: Handle GEOS exception when parsing WKT git-svn-id: http://svn.osgeo.org/qgis/trunk@14904
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  jef 
-
-	* src/core/qgsmaplayer.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: fix #3283 git-svn-id: http://svn.osgeo.org/qgis/trunk@14903
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  wonder 
-
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp: Fixed typo
-	(#3227) git-svn-id: http://svn.osgeo.org/qgis/trunk@14902
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  wonder 
-
-	* src/plugins/geoprocessing/CMakeLists.txt,
-	src/plugins/geoprocessing/geoprocessing.svg,
-	src/plugins/geoprocessing/icon_buffer.xpm,
-	src/plugins/geoprocessing/qgsdlgpgbuffer.cpp,
-	src/plugins/geoprocessing/qgsdlgpgbuffer.h,
-	src/plugins/geoprocessing/qgsdlgpgbufferbase.ui,
-	src/plugins/geoprocessing/qgspggeoprocessing.cpp,
-	src/plugins/geoprocessing/qgspggeoprocessing.h: Removed code of
-	(unused) postgres geoprocessing plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14901
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-13  cfarmer 
-
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: fixes bug
-	when specifying number of classes greater than number of features.
-	Fixes #3325 git-svn-id: http://svn.osgeo.org/qgis/trunk@14900
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-12  macho 
+Larry Shaffer 	2013-03-03
 
-	* i18n/qgis_is.ts: translation update: more .is updates by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14899
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove redundant subheaders for composer panels with appropriate titles
 
-2010-12-12  wonder 
+dakcarto 	2013-03-02
 
-	* images/images.qrc, python/plugins/GdalTools/__init__.py,
-	python/plugins/fTools/__init__.py,
-	python/plugins/fTools/icons/CMakeLists.txt,
-	python/plugins/mapserver_export/__init__.py,
-	python/plugins/osm/__init__.py,
-	python/plugins/plugin_installer/__init__.py, python/utils.py,
-	src/app/qgspluginmanager.cpp, src/gui/qgsdetaileditemdelegate.cpp,
-	src/plugins/coordinate_capture/coordinatecapture.cpp,
-	src/plugins/copyright_label/plugin.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/dxf2shp_converter/dxf2shpconverter.cpp,
-	src/plugins/geoprocessing/qgspggeoprocessing.cpp,
-	src/plugins/georeferencer/qgsgeorefplugin.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/interpolation/qgsinterpolationplugin.cpp,
-	src/plugins/north_arrow/plugin.cpp,
-	src/plugins/offline_editing/offline_editing_plugin.cpp,
-	src/plugins/ogr_converter/plugin.cpp,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp,
-	src/plugins/plugin_template/plugin.cpp, src/plugins/qgisplugin.h,
-	src/plugins/quick_print/quickprintplugin.cpp,
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.
-	cpp, src/plugins/scale_bar/plugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spit/qgsspitplugin.cpp,
-	src/plugins/wfs/qgswfsplugin.cpp: [FEATURE] Support for icons of
-	plugins in the plugin manager dialog.  Both C++ and Python plugins now can implement icon() metadata
-	function which returns path to the icon file name.  The icon file is
-	passed to QPixmap() constructor. For C++ it's preferred to use an
-	icon from the resource file (e.g. ":/plugins/foo/foo_icon.png")
-	because plugin's resource file gets loaded automatically when the
-	plugin is loaded.  Python plugins can use either relative path to
-	the icon ("images/plugin-icon.png") or icon from the resource file
-	(starting with a colon). The relative path is preferred, since it
-	doesn't require the plugin to load its resource file and plugin
-	repository will not have a trouble to fetch the icon automatically.  Updated C++ plugins and Python plugins to include icon where
-	applicable.  Default plugin icon is (c) Anna Shlyapnikova, licensed under
-	Creative Commons (Attribution 3.0 Unported).  git-svn-id: http://svn.osgeo.org/qgis/trunk@14897
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-12  jef 
+    Set minimum width for composition and item properties panels in composer
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14895
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-12  wonder 
-
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_fontmarker.ui: [FEATURE] Font marker:
-	possibility to set X,Y offset. Contributed by Nathan Woodrow -
-	thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14894
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-12  macho 
-
-	* i18n/qgis_pt_PT.ts: translation update: pt more strings by
-	alexandre git-svn-id: http://svn.osgeo.org/qgis/trunk@14893
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-11  mhugent 
-
-	* src/analysis/raster/qgsrastercalclexer.ll,
-	src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalcnode.h,
-	src/analysis/raster/qgsrastercalcparser.yy,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/analysis/raster/qgsrastermatrix.h,
-	src/app/qgsrastercalcdialog.cpp, src/app/qgsrastercalcdialog.h,
-	src/ui/qgsrastercalcdialogbase.ui: [FEATURE]: AND and OR operator
-	for raster calculator git-svn-id: http://svn.osgeo.org/qgis/trunk@14892
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-11  macho 
-
-	* i18n/qgis_is.ts: translation update: is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14891
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-11  gsherman 
-
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: Patch for
-	ticket #3320 to fix delimited text plugin crash git-svn-id: http://svn.osgeo.org/qgis/trunk@14890
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-11  macho 
-
-	* i18n/qgis_pt_PT.ts: translation update: pt by giovanni git-svn-id: http://svn.osgeo.org/qgis/trunk@14889
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-03-02
 
-2010-12-11  gsherman 
-
-	* : 9	4	README
-
-2010-12-10  macho 
-
-	* i18n/qgis_pt_PT.ts: translation update: pt by giovanni git-svn-id: http://svn.osgeo.org/qgis/trunk@14886
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-12-10  macho 
-
-	* i18n/qgis_is.ts: translation update: is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14885
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #7194, tabs partially shown for composer panels
+    
+    - All newly designed panels reworked to ensure smallest reasonable width
 
-2010-12-10  macho 
+Larry Shaffer 	2013-03-02
 
-	* i18n/qgis_pt_PT.ts: translation update: pt by giovanni git-svn-id: http://svn.osgeo.org/qgis/trunk@14884
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix missing SVG previews for existing composer picture item
+    
+    - Previews now load when picture is first selected and its properties are shown (unless already loaded)
+    - NOTE: the loading of SVGs per QListWidget per picture should be replaced with a model/view per composer, or something cached
+    - Combobox no longer over-expands width of dock widget when it contains long paths
 
-2010-12-10  mhugent 
+Larry Shaffer 	2013-03-02
 
-	* src/app/qgsrastercalcdialog.cpp: Remember last raster calc output
-	dir git-svn-id: http://svn.osgeo.org/qgis/trunk@14882
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix Qt connection error
 
-2010-12-10  mhugent 
+Juergen E. Fischer 	2013-03-02
 
-	* src/ui/qgsrastercalcdialogbase.ui: Enabled add result to project
-	by default git-svn-id: http://svn.osgeo.org/qgis/trunk@14881
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix debian builds
 
-2010-12-09  jef 
+Larry Shaffer 	2013-03-01
 
-	* src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h: fix typo
-	spotted by macho git-svn-id: http://svn.osgeo.org/qgis/trunk@14879
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix composer window activations on Windows and Ubuntu
 
-2010-12-09  wonder 
+Larry Shaffer 	2013-03-01
 
-	* CONTRIBUTORS,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h,
-	src/ui/qgsrendererrulepropsdialogbase.ui: Added query builder to
-	rule properties dialog (rule-based renderer). Patch from #3303 -
-	contributed by Nathan Woodrow git-svn-id: http://svn.osgeo.org/qgis/trunk@14878
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update Composer Manager's template functionality
+    
+    - Add specific template path support
+    - Add user templates directory support
+    - Add buttons to open user or default template directory
+    - Add selection of list item for newly added composers
+    - Update GUI with collapsible group box
+    - Use unique title dialog for composer rename function
 
-2010-12-09  mhugent 
+Juergen E. Fischer 	2013-03-01
 
-	* src/app/qgsmaptoollabel.cpp, src/app/qgsmaptoollabel.h,
-	src/app/qgsmaptoolmovelabel.cpp, src/app/qgsmaptoolmovelabel.h,
-	src/app/qgsmaptoolrotatelabel.cpp, src/app/qgsmaptoolrotatelabel.h: 
-	Little improvement for label preview (box), better handling of
-	situations where rotation is not possible git-svn-id: http://svn.osgeo.org/qgis/trunk@14877
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7255 - any editing capability should enable toggle editing
 
-2010-12-09  brushtyler 
+Marco Hugentobler 	2013-03-01
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/widgetBatchBase.py,
-	python/plugins/GdalTools/tools/widgetPluginBase.py: Managed the
-	render flag in batch tools to avoid waste of time loading many
-	layers, to fix #3254 git-svn-id: http://svn.osgeo.org/qgis/trunk@14875
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix WMS filter request with new API (ticket 7258)
 
-2010-12-08  macho 
+Merge: 54f3e0a 735577d
+volaya 	2013-03-01
 
-	* i18n/qgis_pt_PT.ts: translation update: pt_PT by Giovanni git-svn-id: http://svn.osgeo.org/qgis/trunk@14874
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #442 from MatMatt/master
+    
+    [sextante]set package used when writing in case of #passfilenames
 
-2010-12-08  wonder 
+Merge: 4baba76 cc239b2
+Nathan Woodrow 	2013-03-01
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: It's a good habit
-	to use initialize a variable before adding to it git-svn-id: http://svn.osgeo.org/qgis/trunk@14872
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #449 from nyalldawson/grad_fixes
+    
+    Fix calculation of graduated symbology breaks (Fix #7256)
 
-2010-12-08  wonder 
+Denis Rouzaud 	2013-03-01
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Marker line -
-	vertex placement - behave correctly with polygon's rings.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14871
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Do not wait for feature form closing for non-editable layers
 
-2010-12-08  wonder 
+szekerest 	2013-03-01
 
-	* python/core/qgscomposerlegend.sip: Added missing bindings in
-	QgsComposerLegend (#3310) git-svn-id: http://svn.osgeo.org/qgis/trunk@14870
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    MSSQL: Fix for handling spatial tables with no FID columns (#7254)
 
-2010-12-08  wonder 
+Martin Dobias 	2013-03-01
 
-	* python/gui/qgssearchquerybuilder.sip,
-	src/gui/qgssearchquerybuilder.cpp: Allow usage of search query
-	builder with no layer, fixed python binding git-svn-id: http://svn.osgeo.org/qgis/trunk@14869
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix SpatiaLite 3.0 support
 
-2010-12-08  jef 
+Juergen E. Fischer 	2013-03-01
 
-	* python/gui/gui.sip, python/gui/qgssearchquerybuilder.sip,
-	src/app/CMakeLists.txt, src/app/qgssearchquerybuilder.cpp,
-	src/app/qgssearchquerybuilder.h, src/gui/CMakeLists.txt,
-	src/gui/qgssearchquerybuilder.cpp, src/gui/qgssearchquerybuilder.h: 
-	move QgsSearchQuery builder from app to gui git-svn-id: http://svn.osgeo.org/qgis/trunk@14867
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    downgrade plugin load message from WARNING to INFO
 
-2010-12-08  macho 
+Juergen E. Fischer 	2013-03-01
 
-	* i18n/qgis_ta.ts: added tamil language git-svn-id: http://svn.osgeo.org/qgis/trunk@14864
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-12-07  jef 
+Nyall Dawson 	2013-03-01
 
-	* src/providers/wms/qgswmsprovider.cpp: fix #3245 git-svn-id: http://svn.osgeo.org/qgis/trunk@14860
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix calculation of graduated symbology breaks
 
-2010-12-07  jef 
+Larry Shaffer 	2013-02-28
 
-	* src/app/qgsidentifyresults.cpp: fix identify result update after
-	attribute change git-svn-id: http://svn.osgeo.org/qgis/trunk@14859
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add SPATIALITE_INCLUDE_DIR to include directories in analysis cmakelists for new OSM support
 
-2010-12-07  pcav 
+Larry Shaffer 	2013-02-28
 
-	* i18n/qgis_it.ts: More IT GUI translations git-svn-id: http://svn.osgeo.org/qgis/trunk@14858
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add New from Template to composer's Composer menu
+    
+    - Show busy indicator dialog while template is loading into hidden composer (much faster loading)
+    - Clean up composer actions' text (title capitalize action text, sentence capitalize tool tips)
 
-2010-12-06  jef 
+Juergen E. Fischer 	2013-03-01
 
-	* src/app/main.cpp: use system qt translations git-svn-id: http://svn.osgeo.org/qgis/trunk@14856
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    show values of unknown wkbtypes when rendering
 
-2010-12-06  wonder 
+Larry Shaffer 	2013-02-28
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgssymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: [FEATURE]
-	Allow the line symbol layers to be used for outline of polygon
-	(fill) symbols git-svn-id: http://svn.osgeo.org/qgis/trunk@14855
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add new, duplicate and delete composer to iface
+    
+    - Works via QgsComposerView, which is already exposed in iface
 
-2010-12-06  jef 
+Martin Dobias 	2013-02-28
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14854
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Old unmaintained OpenStreetMap support is dead. Long live new OpenStreetMap support!
 
-2010-12-06  jef 
+Juergen E. Fischer 	2013-02-28
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14853
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-12-06  macho 
+Juergen E. Fischer 	2013-02-28
 
-	* i18n/qgis_is.ts: translation update: is by thordor git-svn-id: http://svn.osgeo.org/qgis/trunk@14852
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2010-12-06  alexbruy 
+Martin Dobias 	2013-02-23
 
-	* python/plugins/fTools/tools/doVisual.py: fix error in median value
-	calculation git-svn-id: http://svn.osgeo.org/qgis/trunk@14851
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add file headers, do not report error in case there are no spatial tables in SpatiaLite database
 
-2010-12-06  pcav 
+Martin Dobias 	2013-02-23
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14849
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] new OpenStreetMap data access API and GUI
+    
+    The idea is to replace the current OSM provider+plugin by this new code. Differences from old code:
+    - read-only access - without editing and upload support
+    - no special provider (using SpatiaLite provider)
+    - underlying OSM topology accessible from API
+    - download using Overpass API: fast, customizable, nearly unlimited download
+    - OSM XML files have to be first imported to a Sqlite3 database, then SpatiaLite layers can be exported
 
-2010-12-05  mhugent 
+Martin Dobias 	2013-01-27
 
-	* src/analysis/raster/qgsrastercalculator.cpp: Use
-	GDALAutoCreateWarpedVRT to handle south-up (or rotated) rasters also
-	for calculator. Fixes bug #3281 git-svn-id: http://svn.osgeo.org/qgis/trunk@14842
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    OSM provider: make the looooooooooong lines that create triggers actually readable
 
-2010-12-05  macho 
+szekerest 	2013-02-28
 
-	* i18n/qgis_el_GR.ts: translation update: gr by Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@14841
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    MSSQL: Fix for reading 3D geometries (#6733)
 
-2010-12-04  wonder 
+olivierdalang 	2013-01-21
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/ui/symbollayer/widget_markerline.ui: [FEATURE] Option to put
-	marker on the central point of a line git-svn-id: http://svn.osgeo.org/qgis/trunk@14838
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Updated icons for gis theme
+    
+    - added rotate feature icon
+    - changed add label action icon
+    - added offset curve action
+    - added add html (composer) icon
 
-2010-12-04  wonder 
+Merge: 13b362e 62e6b13
+Larry Shaffer 	2013-02-28
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Added arrowheads
-	(filled and unfilled) to simple markers git-svn-id: http://svn.osgeo.org/qgis/trunk@14837
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #435 from Oslandia/atlas
+    
+    [Atlas] Fix UI to be consistent with the use of QgsCollapsibleWidgets
 
-2010-12-04  wonder 
+Juergen E. Fischer 	2013-02-28
 
-	* CONTRIBUTORS, src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/ui/symbollayer/widget_markerline.ui: [FEATURE] Option to put
-	marker only on first/last vertex of a line (#3279) - contributed by
-	Cedric Moeri - thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14836
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    avoid gdalconst deprecation warning
 
-2010-12-04  jef 
+Merge: 4f397f2 7316701
+Martin Dobias 	2013-02-28
 
-	* src/core/composer/qgscomposeritemgroup.h: fix build error git-svn-id: http://svn.osgeo.org/qgis/trunk@14835
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #446 from matthias-kuhn/diag-py-bindings
+    
+    Make diagram renderer (python bindings) more stable
 
-2010-12-03  brushtyler 
+Juergen E. Fischer 	2013-02-28
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix adding
-	features on geometryless tables git-svn-id: http://svn.osgeo.org/qgis/trunk@14834
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wms provider: also accept application/octet-stream as image content type
 
-2010-12-03  mhugent 
+Matthias Kuhn 	2013-02-28
 
-	* src/app/composer/qgscomposer.cpp, src/ui/qgscomposerbase.ui: Move
-	composer undo buttons to layout menu git-svn-id: http://svn.osgeo.org/qgis/trunk@14832
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Make diagram renderer (python bindings) more stable
 
-2010-12-03  mhugent 
+Marco Hugentobler 	2013-02-28
 
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/app/composer/qgscomposershapewidget.cpp,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/core/composer/qgscomposeritemgroup.cpp,
-	src/core/composer/qgscomposeritemgroup.h,
-	src/gui/qgscomposerview.cpp, src/ui/qgscomposerbase.ui: Added
-	undo/redo buttons in composer, fix undo problems when deleting
-	grouped items git-svn-id: http://svn.osgeo.org/qgis/trunk@14831
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Handle plain/regexp mode for delimited text provider same as for preview
 
-2010-12-02  mhugent 
+Amit Kulkarni 	2013-02-21
 
-	* src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h: Read / write
-	labeling-ng to qml files git-svn-id: http://svn.osgeo.org/qgis/trunk@14830
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add old/new scale comparison and emit scaleChanged only if new scale is different than old.
 
-2010-12-02  timlinux 
+Merge: 84db88b f5d81ae
+Nathan Woodrow 	2013-02-27
 
-	* python/plugins/GdalTools/tools/widgetPluginBase.py: Fix poor
-	english on gdal job completion dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14829
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #445 from szekerest/master
+    
+    MSSQL: Fix for the problem with the length of the numeric fields (Fix #7249)
 
-2010-12-02  pcav 
+szekerest 	2013-02-27
 
-	* i18n/qgis_it.ts, src/plugins/grass/modules-6.4/default.qgc: Typos
-	in IT GUI - thanks Rocco for spotting them git-svn-id: http://svn.osgeo.org/qgis/trunk@14828
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    MSSQL: Fix for the problem with the length of the numeric fields (#7249)
 
-2010-12-02  mhugent 
+Larry Shaffer 	2013-02-27
 
-	* python/core/core.sip, python/core/qgsaddremoveitemcommand.sip,
-	python/core/qgscomposeritemcommand.sip,
-	python/core/qgscomposition.sip, python/gui/qgscomposerview.sip,
-	src/gui/qgscomposerview.h: Add python bindings for composer command
-	classes git-svn-id: http://svn.osgeo.org/qgis/trunk@14827
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Rename QgsComposer::progressDialog
+    
+    - It's a busy indicator that doesn't track operation progress
 
-2010-12-02  borysiasty 
+Larry Shaffer 	2013-02-26
 
-	* src/app/qgsmaptoolselectutils.cpp: apply patch #3280 from Jeremy
-	Palmer git-svn-id: http://svn.osgeo.org/qgis/trunk@14826
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Hide new composer when duplicating (loading template) as it is faster
+    
+    - Show busy indicator dialog
+    - Add busy indicator dialog method to QgsComposer
 
-2010-12-02  jef 
+Merge: 7267c6e af3245b
+Werner Macho 	2013-02-27
 
-	* src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: delimited
-	text provider: fix indentation, some warnings and use intersection
-	only when requested in select().  git-svn-id: http://svn.osgeo.org/qgis/trunk@14825
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #444 from SrNetoChan/master
+    
+    Some translation changes to PT-pt
 
-2010-12-02  gsherman 
+Victor Olaya 	2013-02-27
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: Applied
-	patch to correct selection issue (ticket #3259) git-svn-id: http://svn.osgeo.org/qgis/trunk@14824
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] fixed PointsInPolygonWeighted and PointsLayerFromTable algorithms
 
-2010-12-01  macho 
+Alexandre Neto 	2013-02-26
 
-	* i18n/qgis_is.ts: translation update: more .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14823
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Some translations
 
-2010-12-01  borysiasty 
+Larry Shaffer 	2013-02-26
 
-	* src/app/qgisapp.cpp: apply patch #2938 git-svn-id: http://svn.osgeo.org/qgis/trunk@14820
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add shift-click modifier to QgsCollapsibleGroupBox
+    
+    - Expands current group box on shift-click, then collapses any others in sync group
 
-2010-12-01  macho 
+Larry Shaffer 	2013-02-26
 
-	* i18n/qgis_ja.ts: translation update: .ja by yoichi kayama git-svn-id: http://svn.osgeo.org/qgis/trunk@14819
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Avoid crash where composer is deleted after spawning modal composer manager
 
-2010-12-01  mhugent 
+Larry Shaffer 	2013-02-25
 
-	* src/plugins/CMakeLists.txt: Only compile offline plugin if
-	spatialite is enabled git-svn-id: http://svn.osgeo.org/qgis/trunk@14816
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add unique title input dialog for new and duplicate composers
+    
+    - Allows user to title composer before creation (optionally based on existing composer titles)
+    - Helps limit duplicate titles
+    - Non-GUI generation of new and duplicate composers not restricted (unchanged)
+    - Duplicate composer slot now free of GUI interruptions
+    - Change from hiding of duplicate composer (during template loading) to pausing updates to give user feedback
 
-2010-11-30  borysiasty 
+Hugo Mercier 	2013-02-26
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14815
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Revert "[Atlas] Replace QgsCollapsibleGroupBoxBasic by QgsCollapsibleGroupBox (add auto-save collapsilble states)"
+    
+    This reverts commit 56e9fb3eba0dfaf8f02bb2ccb66eb0218066a8f3.
 
-2010-11-30  jef 
+Marco Hugentobler 	2013-02-26
 
-	* src/app/qgsrasterlayerproperties.cpp: fix #3274 git-svn-id: http://svn.osgeo.org/qgis/trunk@14814
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reject features with empty geometry in QgsMapToolAddFeature
 
-2010-11-30  macho 
+Matteo Mattiuzzi 	2013-02-26
 
-	* i18n/qgis_is.ts: translation update: .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14813
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    now passFileNames uses raster in case of writing.
+    raster:::writeRaster supports any gdal formats (passFileNames and useRasterPackage)
+    and some other changes
 
-2010-11-30  wonder 
+Marco Hugentobler 	2013-02-26
 
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp: Use transparent
-	background color for symbol / symbol layer preview git-svn-id: http://svn.osgeo.org/qgis/trunk@14811
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix placement of simple markers in cached images
 
-2010-11-30  wonder 
+Victor Olaya 	2013-02-26
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/ui/CMakeLists.txt, src/ui/symbollayer/widget_centroidfill.ui: 
-	[FEATURE] Added "centroid fill" symbol layer which draws a marker on
-	polygon's centroid.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@14810
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-30  wonder 
-
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h: Fixed changing of
-	marker color in marker line symbol layer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14809
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-30  jef 
-
-	* src/app/qgisapp.cpp: fix r14798: label tools work independently
-	from current layer. Thanks Marco! git-svn-id: http://svn.osgeo.org/qgis/trunk@14803
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  jef 
-
-	* i18n/qgis_de.ts, src/app/composer/qgscomposerpicturewidget.cpp: 
-	german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14802
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  macho 
-
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14800
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  jef 
-
-	* src/app/attributetable/qgsattributetablemodel.cpp: catch attribute
-	additions and deletions in attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@14799
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgsmaptoolmovelabel.h,
-	src/app/qgsmaptoolrotatelabel.h: activate/deactivate labeling tools git-svn-id: http://svn.osgeo.org/qgis/trunk@14798
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  jef 
-
-	* src/app/CMakeLists.txt, src/app/qgsavoidintersectionsdialog.cpp,
-	src/app/qgsavoidintersectionsdialog.h,
-	src/app/qgsprojectproperties.cpp, src/app/qgssnappingdialog.cpp,
-	src/app/qgssnappingdialog.h,
-	src/ui/qgsavoidintersectionsdialogbase.ui,
-	src/ui/qgssnappingdialogbase.ui: integrate 'Avoid intersections of
-	new polygons' into snapping dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14797
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  mhugent 
-
-	* src/app/composer/qgscomposershapewidget.cpp: [FEATURE]: Undo/Redo
-	support for the print composer. Dummy commit for the docu team as
-	the last commit missed the feature keyword git-svn-id: http://svn.osgeo.org/qgis/trunk@14787
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  mhugent 
-
-	* python/gui/qgscomposerview.sip, src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposer.h,
-	src/app/composer/qgscomposerarrowwidget.cpp,
-	src/app/composer/qgscomposerarrowwidget.h,
-	src/app/composer/qgscomposeritemwidget.cpp,
-	src/app/composer/qgscomposerlabelwidget.cpp,
-	src/app/composer/qgscomposerlabelwidget.h,
-	src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/app/composer/qgscomposermapwidget.cpp,
-	src/app/composer/qgscomposermapwidget.h,
-	src/app/composer/qgscomposerpicturewidget.cpp,
-	src/app/composer/qgscomposerpicturewidget.h,
-	src/app/composer/qgscomposerscalebarwidget.cpp,
-	src/app/composer/qgscomposershapewidget.cpp,
-	src/app/composer/qgscomposershapewidget.h,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h, src/core/CMakeLists.txt,
-	src/core/composer/qgsaddremoveitemcommand.cpp,
-	src/core/composer/qgsaddremoveitemcommand.h,
-	src/core/composer/qgscomposerarrow.cpp,
-	src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposeritemcommand.cpp,
-	src/core/composer/qgscomposeritemcommand.h,
-	src/core/composer/qgscomposeritemgroup.cpp,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h,
-	src/core/composer/qgscomposerpicture.cpp,
-	src/core/composer/qgscomposerpicture.h,
-	src/core/composer/qgscomposershape.cpp,
-	src/core/composer/qgscomposition.cpp,
-	src/core/composer/qgscomposition.h, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h: Initial implementation of composer undo /
-	redo git-svn-id: http://svn.osgeo.org/qgis/trunk@14786
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-29  gsherman 
-
-	* resources/context_help/QgsDelimitedTextPluginGui-en_US,
-	src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.h,
-	src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: Squashed
-	commit of the following: Application of patch from ticket #3259 -
-	support WKT field in delimited text plugin.  commit
-	    0dc370a39c7349d85859fac462e91e346bf8fb83 Modified context help to
-	    reflect addition of WKT capability to the delimited text plugin.      Tightened up the delimited text dialog a bit.  commit
-	    25484867621d6b4760952a8f00a07d253273ecfd Added *.wkt to file open
-	filter commit 9f16a276b6b2ecbea2eebede50e3275a1df0389b     Patch for providing wkt support in delimited text plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14781
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-28  wonder 
-
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_linedecoration.ui: Fixed scaling of line
-	decoration symbol layer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14780
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-28  wonder 
-
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_markerline.ui: [FEATURE] Allow the marker
-	line symbol layer draw markers on each vertex.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@14779
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-28  jef 
-
-	* src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h,
-	src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h,
-	src/ui/qgsprojectpropertiesbase.ui, src/ui/qgssnappingdialogbase.ui: 
-	apply #3258 git-svn-id: http://svn.osgeo.org/qgis/trunk@14778
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-28  jef 
-
-	* src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h,
-	src/core/qgsmaplayerregistry.cpp, src/ui/qgssnappingdialogbase.ui: 
-	apply #3232 git-svn-id: http://svn.osgeo.org/qgis/trunk@14777
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-28  mhugent 
-
-	* src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h,
-	src/core/composer/qgscomposerattributetable.cpp: Fix for composer
-	attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@14776
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-27  jef 
-
-	* python/core/qgscomposeritem.sip: fix lenny build git-svn-id: http://svn.osgeo.org/qgis/trunk@14775
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-26  jef 
-
-	* src/app/qgsnewspatialitelayerdialog.cpp,
-	src/mapserver/CMakeLists.txt,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/spit/qgsspitbase.ui,
-	src/providers/wms/qgswmsprovider.cpp: fix link error in mapserver
-	with internal spatialite & some warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14774
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-26  jef 
-
-	* debian/rules: debian packaging: fix natty build git-svn-id: http://svn.osgeo.org/qgis/trunk@14773
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-26  jef 
-
-	* src/core/gps/qgsgpsdetector.cpp: add support for ttyACM devices git-svn-id: http://svn.osgeo.org/qgis/trunk@14772
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-26  mhugent 
-
-	* python/core/qgscomposeritem.sip: Uncomment convert code for
-	attribute table item git-svn-id: http://svn.osgeo.org/qgis/trunk@14771
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-26  mhugent 
-
-	* python/core/core.sip, python/core/qgscomposerattributetable.sip,
-	python/core/qgscomposertable.sip, python/gui/qgscomposerview.sip,
-	src/core/composer/qgscomposertable.h: Added binding files for
-	composer attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@14770
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14769
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  jef 
-
-	* src/app/CMakeLists.txt,
-	src/app/qgsmaptoolchangelabelproperties.h,
-	src/app/qgsmaptoolmovelabel.h, src/app/qgsmaptoolrotatelabel.h,
-	src/app/qgsnewspatialitelayerdialog.cpp,
-	src/plugins/offline_editing/offline_editing.cpp: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14768
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  wonder 
-
-	* python/core/qgscomposeritem.sip,
-	python/core/qgscomposerlabel.sip,
-	python/core/qgscomposerlegend.sip, python/core/qgscomposermap.sip,
-	python/core/qgscomposerpicture.sip,
-	python/core/qgscomposerscalebar.sip,
-	python/core/qgscomposershape.sip, python/core/qgspaperitem.sip,
-	src/core/composer/qgscomposerarrow.h,
-	src/core/composer/qgscomposerattributetable.h,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposeritemgroup.h,
-	src/core/composer/qgscomposerlabel.h,
-	src/core/composer/qgscomposerlegend.h,
-	src/core/composer/qgscomposermap.h,
-	src/core/composer/qgscomposerpicture.h,
-	src/core/composer/qgscomposerscalebar.h,
-	src/core/composer/qgscomposershape.h,
-	src/core/composer/qgscomposertable.h,
-	src/core/composer/qgscomposertexttable.h,
-	src/core/composer/qgspaperitem.h: Proper conversion to subclasses
-	for composer items.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14766
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  jef 
-
-	* src/app/qgsattributedialog.cpp, src/app/qgsattributedialog.h,
-	src/app/qgsfeatureaction.cpp, src/app/qgsfeatureaction.h: fix form
-	actions git-svn-id: http://svn.osgeo.org/qgis/trunk@14765
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  jef 
-
-	* debian/rules, src/app/qgsnewspatialitelayerdialog.cpp,
-	src/plugins/offline_editing/offline_editing.cpp: debian packaging:
-	switch to internal spatialite git-svn-id: http://svn.osgeo.org/qgis/trunk@14764
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  esseffe 
-
-	* AUTHORS, debian/copyright, python/core/qgsapplication.sip,
-	src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h, src/core/qgsapplication.cpp,
-	src/core/qgsapplication.h,
-	src/core/spatialite/headers/spatialite.h,
-	src/core/spatialite/headers/spatialite/gaiaaux.h,
-	src/core/spatialite/headers/spatialite/gaiaexif.h,
-	src/core/spatialite/headers/spatialite/gaiageo.h,
-	src/core/spatialite/headers/spatialite/spatialite.h,
-	src/core/spatialite/headers/spatialite/sqlite3.h,
-	src/core/spatialite/headers/spatialite/sqlite3ext.h,
-	src/core/spatialite/spatialite.c, src/core/spatialite/sqlite3.c,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/offline_editing/offline_editing.h,
-	src/providers/spatialite/qgsspatialiteprovider.h: upgrading to
-	SpatiaLite 2.4.0-RC4 git-svn-id: http://svn.osgeo.org/qgis/trunk@14763
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  mhugent 
-
-	* cmake/Flex.cmake: Omit flex debug output git-svn-id: http://svn.osgeo.org/qgis/trunk@14762
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-25  mhugent 
-
-	* src/app/composer/qgscomposer.cpp, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h: Fix for paint event problems in case of
-	multiple composer maps git-svn-id: http://svn.osgeo.org/qgis/trunk@14761
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts,
-	i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation
-	update: the long awaited string update :) git-svn-id: http://svn.osgeo.org/qgis/trunk@14760
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  macho 
-
-	* i18n/qgis_is.ts: translation update: another .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14759
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  cfarmer 
-
-	* python/plugins/fTools/tools/doGeometry.py: some quick fixes to
-	voronoi and delaunay tools git-svn-id: http://svn.osgeo.org/qgis/trunk@14758
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  pcav 
-
-	* src/plugins/grass/modules-6.4/default.qgc: Removed duplicated
-	entry in GRASS modules list git-svn-id: http://svn.osgeo.org/qgis/trunk@14757
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  pcav 
-
-	* src/plugins/grass/modules-common/v.in.ogr.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.where.1.svg,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.where.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgm: Further improvements
-	to v.in.ogr GRASS modules git-svn-id: http://svn.osgeo.org/qgis/trunk@14756
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-24  jef 
+    [sextante] fixed wrong import
 
-	* src/core/qgsvectorlayer.cpp: also save edit types and actions for
-	geometry-less layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14755
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-02-25
 
-2010-11-23  jef 
+    [sextante] fix typo
 
-	* src/app/attributetable/qgsattributetablememorymodel.cpp,
-	src/app/attributetable/qgsattributetablememorymodel.h,
-	src/app/attributetable/qgsattributetablemodel.cpp: fix #3248 git-svn-id: http://svn.osgeo.org/qgis/trunk@14754
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-25
 
-2010-11-23  macho 
+    [sextante] deleted problematic help files
 
-	* i18n/qgis_is.ts: translation update: even more .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14753
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-25
 
-2010-11-23  pcav 
+    [sextante]modified problematic headers
 
-	* src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-common/v.in.ogr.all.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.all.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.loc.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.where.qgm: Added
-	snapping option to GRASS vector import commands git-svn-id: http://svn.osgeo.org/qgis/trunk@14752
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 148e7e1 aa4b291
+volaya 	2013-02-25
 
-2010-11-23  mhugent 
+    Merge pull request #440 from MatMatt/master
+    
+    [sextante] changed R command .libPaths to add and not substitute paths
 
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h: 
-	Fix composer item selection git-svn-id: http://svn.osgeo.org/qgis/trunk@14750
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-02-25
 
-2010-11-23  jef 
+    forgot rest of the files ;) now adding translator and adjusted scripts
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h: allow opening
-	attribute table from plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@14749
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-02-25
 
-2010-11-23  jef 
+    added first malayam language commit. translator assumed and flag added
 
-	* src/providers/postgres/qgspostgresprovider.cpp: apply #3242 git-svn-id: http://svn.osgeo.org/qgis/trunk@14748
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matteo Mattiuzzi 	2013-02-25
 
-2010-11-23  gsherman 
+    changed the R command behavior .libPaths() in RAlgorithm.py to add a .lib.loc and not substitute one
+    modifies the Advanced_Raster_histogramm.rsx in order to fully benefit from raster package RAM savety
 
-	* : Remove developer image as requested git-svn-id: http://svn.osgeo.org/qgis/trunk@14747
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f85d3ae 79d5fb3
+volaya 	2013-02-25
 
-2010-11-23  cfarmer 
+    Merge pull request #439 from mach0/master
+    
+    Added html help files to be installed in doc directory for OTB help
 
-	* python/plugins/fTools/tools/doSelectByLocation.py: adds option to
-	use selected features only; addresses #2476 git-svn-id: http://svn.osgeo.org/qgis/trunk@14746
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-02-25
 
-2010-11-22  cfarmer 
+    added help files in doc subdirectory to be installed
 
-	* python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/voronoi.py: add some copywrite info git-svn-id: http://svn.osgeo.org/qgis/trunk@14745
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5ac7d03 cfb56a2
+volaya 	2013-02-25
 
-2010-11-22  cfarmer 
+    Merge pull request #438 from MatMatt/master
+    
+    [sextante] added quotation marks to make passFileNames work.
 
-	* python/plugins/fTools/fTools.py,
-	python/plugins/fTools/resources.qrc,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/voronoi.py: [FEATURE] Adds voronoi
-	polygon tool to Vector menu, addresses #2825; Also (partially)
-	addresses #2546 git-svn-id: http://svn.osgeo.org/qgis/trunk@14744
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+matteo 	2013-02-25
 
-2010-11-22  wonder 
+    added quotation marks to make passFileNames work
 
-	* python/gui/qgscomposerview.sip, src/app/composer/qgscomposer.cpp,
-	src/gui/qgscomposerview.h: Make signal
-	QgsComposerView::selectedItemChanged with non-const pointer to avoid
-	problems with some PyQt versions git-svn-id: http://svn.osgeo.org/qgis/trunk@14743
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2013-02-25
 
-2010-11-22  jef 
+    [Atlas] Replace QgsCollapsibleGroupBoxBasic by QgsCollapsibleGroupBox (add auto-save collapsilble states)
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp,
-	src/app/qgsmaptoolsimplify.cpp, src/core/qgsgeometry.cpp,
-	src/plugins/grass/qgsgrasstoolsbase.ui,
-	src/plugins/oracle_raster/qgsselectgeorasterbase.ui: fix warnings
-	(gcc 4.5.1, Qt 4.7.1) git-svn-id: http://svn.osgeo.org/qgis/trunk@14742
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 34e6b9a 9517c0e
+Hugo Mercier 	2013-02-25
 
-2010-11-22  jef 
+    Merge pull request #1 from dakcarto/atlas-ui
+    
+    [Atlas] Update spacing for atlas panel
 
-	* debian/compat.natty, debian/control.natty, debian/rules,
-	src/app/CMakeLists.txt, src/app/qgspluginmanager.cpp: debian
-	packaging: add support ubuntu natty support git-svn-id: http://svn.osgeo.org/qgis/trunk@14741
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-02-22
 
-2010-11-22  macho 
+    [FEATURE] Add duplicate function to composer manager and composer ui
+    
+    - Addresses feature request #7203
+    - Add actions to composer that trigger main app's, instead of referencing
+    - Allows Ctrl(Cmd)-P to initiate printing (instead of a new composer)
+    - Allows Ctrl(Cmd)-N to create new composer
+    - Use new templateXML function when saving composer template
 
-	* i18n/qgis_is.ts: translation update: more .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14740
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-24
 
-2010-11-22  jef 
+    [sextante]Replaced provider.crs() by layer.crs(). Fixed memory layer usage
 
-	* src/app/attributetable/qgsattributetablemodel.cpp: reduce
-	attribute table debugging noise git-svn-id: http://svn.osgeo.org/qgis/trunk@14739
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-24
 
-2010-11-22  jef 
+    [sextante]deleted ftool_utils
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix capabilities
-	detection for postgres >=8.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@14738
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-24
 
-2010-11-22  mhugent 
+    [sextante] added autofilling on double-click in batch processing dialog
+    Other minor changes
 
-	* python/core/qgscomposeritem.sip: Apply fix for ticket #3236,
-	provided by NathanW git-svn-id: http://svn.osgeo.org/qgis/trunk@14736
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-24
 
-2010-11-22  macho 
+    [sextante]Changed how SAGA installation is checked
 
-	* cmake/FindQWT.cmake: small fix: gentoo stores pyqwt in qwt5 dir git-svn-id: http://svn.osgeo.org/qgis/trunk@14735
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-23
 
-2010-11-21  cfarmer 
+    [sextante] improved handling of ParameterCrs
 
-	* python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/frmRandPoints.ui: Removes extraneous
-	minimum distance option (not currently a real option) from random
-	points tool. Addresses #3213 git-svn-id: http://svn.osgeo.org/qgis/trunk@14734
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-23
 
-2010-11-21  jef 
+    [sextante] minor changes in algorithms and some code cleaning
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14733
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-23
 
-2010-11-21  macho 
+    [sextante] changes in R interface
 
-	* i18n/qgis_is.ts: translation update: .is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@14732
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-22
 
-2010-11-21  macho 
+    [sextante] added new modeler-only tools
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14731
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-21
 
-2010-11-21  jef 
+    [sextante] changed statisticByCategories, so now it does not depend on external libs
 
-	* ms-windows/QGIS-Installer.nsi: nsis installer: remove desktop icon git-svn-id: http://svn.osgeo.org/qgis/trunk@14730
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-21
 
-2010-11-21  jef 
+    [sextante]Improvements in batch processing interface and in the simplified toolbox organization
 
-	* src/app/attributetable/qgsattributetabledelegate.cpp,
-	src/app/attributetable/qgsattributetabledelegate.h,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetabledialog.h,
-	src/app/attributetable/qgsattributetablememorymodel.cpp,
-	src/app/attributetable/qgsattributetablememorymodel.h,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/attributetable/qgsattributetablemodel.h,
-	src/app/attributetable/qgsattributetableview.cpp,
-	src/app/attributetable/qgsattributetableview.h,
-	src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/qgisappinterface.cpp, src/app/qgsfeatureaction.cpp,
-	src/app/qgsfeatureaction.h, src/app/qgsidentifyresults.cpp,
-	src/app/qgsidentifyresults.h, src/app/qgsmaptooladdfeature.cpp,
-	src/app/qgsmaptooladdfeature.h, src/app/qgsmaptoolidentify.cpp,
-	src/app/qgsmergeattributesdialog.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/ui/qgsattributetabledialog.ui: 
-	[FEATURE] attribute editing improvements: - refactor attribute dialog calls to QgsFeatureAttribute - add QgsVectorLayer::featureAdded signal - improve interactive attribute editing in table (adding/deleting   features, attribute update) - allow adding of geometryless features - fix attribute undo/redo git-svn-id: http://svn.osgeo.org/qgis/trunk@14729
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-21
 
-2010-11-21  jef 
+    [sextante] commented out loadfromDict method
 
-	* .gitignore, src/app/qgssnappingdialog.cpp,
-	src/ui/qgsannotationwidgetbase.ui, src/ui/qgscredentialdialog.ui,
-	src/ui/qgsdetaileditemwidgetbase.ui,
-	src/ui/qgstextannotationdialogbase.ui: - update .gitignore - typo fix - fix ui permissions git-svn-id: http://svn.osgeo.org/qgis/trunk@14728
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-02-21
 
-2010-11-21  timlinux 
+    [sextante] changed saga cmdname method and modified merge raster algorithm description
 
-	* ms-windows/quickpackage.sh: Fixed some soft coded values which
-	should have been hard coded git-svn-id: http://svn.osgeo.org/qgis/trunk@14726
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-02-24
 
-2010-11-21  timlinux 
-
-	* ms-windows/quickpackage.sh: Added small script to build the
-	package only git-svn-id: http://svn.osgeo.org/qgis/trunk@14725
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-20  jef 
-
-	* src/app/qgsmaptoolnodetool.cpp: fix rubberband in node tool
-	(probably introduced with r14679) git-svn-id: http://svn.osgeo.org/qgis/trunk@14723
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-20  timlinux 
-
-	* .gitignore: Ignore extract dirs and installer exe git-svn-id: http://svn.osgeo.org/qgis/trunk@14722
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-20  timlinux 
-
-	* INSTALL, doc/msvc.t2t: Updated packaging notes a little git-svn-id: http://svn.osgeo.org/qgis/trunk@14721
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-20  timlinux 
-
-	* .gitignore: Add some more directories to the git ignore list git-svn-id: http://svn.osgeo.org/qgis/trunk@14720
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-20  jef 
-
-	* ms-windows/osgeo4w/creatensis.pl: creatensis.pl: creating the
-	postinstall/preremove batchs is cheap git-svn-id: http://svn.osgeo.org/qgis/trunk@14719
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-19  jef 
-
-	* ms-windows/osgeo4w/creatensis.pl: build from osgeo4w qgis-full
-	package git-svn-id: http://svn.osgeo.org/qgis/trunk@14718
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-19  jef 
-
-	* ms-windows/QGIS-Installer.nsi, ms-windows/osgeo4w/creatensis.pl: 
-	update osgeo4w version nsis installer git-svn-id: http://svn.osgeo.org/qgis/trunk@14717
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-19  timlinux 
-
-	* doc/index.html: Reinstated this as it got trampled by a copy of
-	coding guidelines in a previous commit git-svn-id: http://svn.osgeo.org/qgis/trunk@14715
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-19  mhugent 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp,
-	src/app/legend/qgslegendlayer.h,
-	src/core/renderer/qgsgraduatedsymbolrenderer.h,
-	src/core/renderer/qgsrenderer.h,
-	src/core/renderer/qgssinglesymbolrenderer.h,
-	src/core/renderer/qgsuniquevaluerenderer.h,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp: [FEATURE]: Add
-	possibility to show number of features in legend classes. Accessible
-	via right click legend menu git-svn-id: http://svn.osgeo.org/qgis/trunk@14714
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-19  jef 
-
-	* src/analysis/interpolation/CloughTocherInterpolator.cc,
-	src/analysis/interpolation/DualEdgeTriangulation.cc,
-	src/analysis/interpolation/MathUtils.cc,
-	src/analysis/interpolation/MathUtils.h,
-	src/analysis/interpolation/Point3D.h,
-	src/analysis/interpolation/Vector3D.h,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/app/legend/qgslegend.cpp, src/app/qgsdisplayangle.cpp,
-	src/app/qgslabeldialog.cpp, src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolsimplify.cpp,
-	src/app/qgspointrotationitem.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/composer/qgscomposerarrow.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposerpicture.cpp,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgsdistancearea.cpp, src/core/qgsmaprenderer.cpp,
-	src/core/qgspallabeling.cpp, src/core/qgspoint.cpp,
-	src/core/qgsrectangle.cpp, src/core/qgsscalecalculator.cpp,
-	src/core/qgssearchtreenode.cpp, src/core/qgstolerance.cpp,
-	src/core/qgsvectorlayer.cpp,
-	src/core/raster/qgscolorrampshader.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgssinglesymbolrenderer.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.cpp,
-	src/core/spatialindex/geometry/LineSegment.cc,
-	src/core/spatialindex/geometry/Region.cc,
-	src/core/spatialindex/rtree/Index.cc,
-	src/core/spatialindex/rtree/Node.cc,
-	src/core/spatialindex/rtree/RTree.cc,
-	src/core/spatialindex/tools/ExternalSort.cc,
-	src/core/spatialindex/tools/Tools.cc,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/gui/qgsannotationitem.cpp, src/gui/qgsmapcanvas.cpp,
-	src/mapserver/qgssldrule.cpp, src/mapserver/qgswmsserver.cpp,
-	src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsleastsquares.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/grass/qgsgrassedit.cpp,
-	src/plugins/grass/qgsgrassnewmapset.cpp,
-	src/plugins/grass/qtermwidget/TerminalDisplay.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp, src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/wms/qgswmsprovider.cpp: use Qt macros also for
-	min/max/abs/fabs - removes OSX cmath kludges git-svn-id: http://svn.osgeo.org/qgis/trunk@14713
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  mhugent 
-
-	* src/core/qgsvectorfilewriter.cpp: Also write features without
-	geometry in vector filewriter git-svn-id: http://svn.osgeo.org/qgis/trunk@14712
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  jef 
-
-	* src/analysis/interpolation/qgsinterpolator.cpp,
-	src/analysis/interpolation/qgstininterpolator.cpp,
-	src/app/qgsprojectproperties.h, src/core/qgis.h,
-	src/core/qgsclipper.h, src/core/qgspallabeling.cpp,
-	src/core/qgspoint.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/spatialindex/geometry/Region.cc,
-	src/gui/qgsquickprint.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsleastsquares.cpp,
-	src/plugins/scale_bar/plugin.cpp: use Qt for isnan/isinf/abs git-svn-id: http://svn.osgeo.org/qgis/trunk@14711
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  mhugent 
-
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/app/qgsprojectproperties.cpp: Fix restoring selection color from
-	project and allow alpha values for selection color git-svn-id: http://svn.osgeo.org/qgis/trunk@14710
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  timlinux 
-
-	* .gitignore: Added git ignore rules for more git zen git-svn-id: http://svn.osgeo.org/qgis/trunk@14709
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14708
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-18  jef 
-
-	* scripts/prepare-commit.sh, src/app/qgslabelpropertydialog.cpp: fix
-	lenny build git-svn-id: http://svn.osgeo.org/qgis/trunk@14707
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  jef 
-
-	* ms-windows/osgeo4w/package.cmd, src/app/legend/qgslegend.cpp: fix
-	legend handling of collapsed layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14705
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  jef 
-
-	* ms-windows/osgeo4w/package.cmd, src/app/legend/qgslegend.cpp: 
-	improve dragging legend layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14704
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  timlinux 
-
-	* src/app/qgisapp.cpp, src/ui/qgslabelingguibase.ui: Put label icon
-	on label toolbar. Some cleanups for labelling ui git-svn-id: http://svn.osgeo.org/qgis/trunk@14703
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  timlinux 
-
-	* src/ui/qgslabelingguibase.ui: Use 22x22 icons in label dialog tab
-	bar git-svn-id: http://svn.osgeo.org/qgis/trunk@14701
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  mhugent 
-
-	* src/app/qgsmaptoolrotatelabel.cpp: Fix bug in rotate label tool
-	(thanks, Juergen) git-svn-id: http://svn.osgeo.org/qgis/trunk@14700
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-11-17  mhugent 
-
-	* src/core/qgslabelsearchtree.h, src/core/qgsmaprenderer.h: Added
-	CORE_EXPORTs git-svn-id: http://svn.osgeo.org/qgis/trunk@14699
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    small help file change
 
-2010-11-17  mhugent 
+Werner Macho 	2013-02-23
 
-	* src/app/qgslabelpropertydialog.cpp,
-	src/app/qgslabelpropertydialog.h: Forgot to add two files in last
-	commit git-svn-id: http://svn.osgeo.org/qgis/trunk@14698
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adding some licenses and copyrights to sextante
 
-2010-11-17  mhugent 
+Nathan Woodrow 	2013-02-23
 
-	* images/images.qrc, python/core/qgsmaprenderer.sip,
-	python/core/qgspoint.sip, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptoolchangelabelproperties.cpp,
-	src/app/qgsmaptoolchangelabelproperties.h,
-	src/app/qgsmaptoollabel.cpp, src/app/qgsmaptoollabel.h,
-	src/app/qgsmaptoolmovelabel.cpp, src/app/qgsmaptoolmovelabel.h,
-	src/app/qgsmaptoolrotatelabel.cpp, src/app/qgsmaptoolrotatelabel.h,
-	src/app/qgspointrotationitem.cpp, src/app/qgspointrotationitem.h,
-	src/core/CMakeLists.txt, src/core/pal/labelposition.cpp,
-	src/core/pal/labelposition.h, src/core/qgslabelsearchtree.cpp,
-	src/core/qgslabelsearchtree.h, src/core/qgsmaprenderer.h,
-	src/core/qgspallabeling.cpp, src/core/qgspallabeling.h,
-	src/core/qgspoint.cpp, src/core/qgspoint.h,
-	src/ui/qgslabelpropertydialogbase.ui: [FEATURE]: move/rotate/change
-	label edit tools to interactively change data defined label
-	properties git-svn-id: http://svn.osgeo.org/qgis/trunk@14697
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Replace saving done dialog with message bar
 
-2010-11-17  mhugent 
+Larry Shaffer 	2013-02-22
 
-	* src/analysis/raster/qgsrastercalclexer.ll: Allow more characters
-	in raster ref names. Fixes r3172 git-svn-id: http://svn.osgeo.org/qgis/trunk@14696
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6184, canvas doesn't refresh after pasting layer style
 
-2010-11-17  timlinux 
+Larry Shaffer 	2013-02-22
 
-	* CODING, doc/CODING.t2t, src/ui/qgsoptionsbase.ui,
-	src/ui/qgsprojectpropertiesbase.ui,
-	src/ui/qgsrasterlayerpropertiesbase.ui,
-	src/ui/qgsvectorlayerpropertiesbase.ui: Updated tab bars to use
-	22x22 icons and updated HIG guideline accordingly git-svn-id: http://svn.osgeo.org/qgis/trunk@14695
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Update spacing for atlas panel
 
-2010-11-17  mhugent 
+Hugo Mercier 	2013-02-22
 
-	* src/analysis/raster/qgsrastercalclexer.ll: Allow hyphen in raster
-	refercnes git-svn-id: http://svn.osgeo.org/qgis/trunk@14694
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Fix UI to be consistent with the use of QgsCollapsibleWidgets
 
-2010-11-16  jef 
+Merge: 857f849 8176da0
+Jürgen Fischer 	2013-02-21
 
-	* src/analysis/raster/qgsrastercalcnode.h,
-	src/core/gps/qgsgpsdconnection.cpp, src/ui/qgsabout.ui,
-	src/ui/qgscomposerarrowwidgetbase.ui,
-	src/ui/qgsfieldcalculatorbase.ui,
-	src/ui/qgsitempositiondialogbase.ui, src/ui/qgsoptionsbase.ui,
-	src/ui/qgspgnewconnectionbase.ui,
-	src/ui/qgsvectorgradientcolorrampv2dialogbase.ui: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14693
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #433 from 3nids/pg_hstore
+    
+    added hstore and inet fields to postgres provider
 
-2010-11-16  alexbruy 
+Juergen E. Fischer 	2013-02-22
 
-	* python/plugins/GdalTools/tools/dialogSettings.ui: add missed GUI
-	elements in GdalTools settings dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14692
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    da60fe fixes #7071
 
-2010-11-16  jef 
+Juergen E. Fischer 	2013-02-22
 
-	* CMakeLists.txt, scripts/prepare-commit.sh: add some git support git-svn-id: http://svn.osgeo.org/qgis/trunk@14691
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    block vector layer signals when updating attribute values from field calculator (fixes #7190)
 
-2010-11-16  jef 
+Juergen E. Fischer 	2013-02-22
 
-	* src/app/qgssnappingdialog.cpp: apply #3220 git-svn-id: http://svn.osgeo.org/qgis/trunk@14690
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-11-16  kyngchaos 
+Marco Hugentobler 	2013-02-21
 
-	* mac/cmake/0qgis.cmake.in, mac/cmake/1qt.cmake.in,
-	mac/cmake/2lib.cmake.in, mac/cmake/3fw.cmake.in: only post-process
-	mapserver if configured git-svn-id: http://svn.osgeo.org/qgis/trunk@14689
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Some wfs servers don't like srsname in DescribeFeatureType request (ticket #5241)
 
-2010-11-15  jef 
+Marco Hugentobler 	2013-02-21
 
-	* src/core/qgis.h: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@14688
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove namespace prefix from typename in QgsGml
 
-2010-11-15  jef 
+Werner Macho 	2013-02-21
 
-	* src/app/qgssinglesymboldialog.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/core/qgis.h: fix build
-	errors git-svn-id: http://svn.osgeo.org/qgis/trunk@14687
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adding some function help files for field calculator, thanks to Zoltan Siki
 
-2010-11-15  alexbruy 
+Larry Shaffer 	2013-02-20
 
-	* python/plugins/fTools/tools/doGeometry.py: add new simplify tool
-	to the fTools. Completed changes introduced in r14678 git-svn-id: http://svn.osgeo.org/qgis/trunk@14686
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix duplication of main app's Window and Help menu to composers for Mac
 
-2010-11-15  brushtyler 
+Larry Shaffer 	2013-02-21
 
-	* src/plugins/grass/qgsgrassregionbase.ui: added usage message into
-	selection GRASS gui git-svn-id: http://svn.osgeo.org/qgis/trunk@14683
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Followup to be3bad3
+    
+    - Simpler means of bringing composer windows to front, if manager dialog is going to be closed
 
-2010-11-15  timlinux 
+D'Hont René-Luc 	2013-02-21
 
-	* CODING, doc/CODING.t2t: Updated HIG guidelines git-svn-id: http://svn.osgeo.org/qgis/trunk@14682
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WGIS WFS Server : GeoJSON Fid has to be a String
+    
+    Adding "\"" befaore and after the fid for the GeoJSOn format.
 
-2010-11-15  timlinux 
+Denis Rouzaud 	2013-02-21
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/ui/qgsrasterlayerpropertiesbase.ui: Fix broken behaviour in
-	raster props dialog for reset original null value git-svn-id: http://svn.osgeo.org/qgis/trunk@14681
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added hstore and inet fields to postgres provider
 
-2010-11-15  timlinux 
+Juergen E. Fischer 	2013-02-21
 
-	* src/app/qgsrasterlayerproperties.cpp: Stretch columns in
-	transparency list on raster props dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14680
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging update
 
-2010-11-15  jef 
+Marco Hugentobler 	2013-02-21
 
-	* src/gui/qgsrubberband.cpp: fix starting point duplication in
-	rubberband when using addPoint thought the API git-svn-id: http://svn.osgeo.org/qgis/trunk@14679
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Protect point and line pattern symbol layer from eating too much memory
 
-2010-11-15  cfarmer 
+Juergen E. Fischer 	2013-02-20
 
-	* python/plugins/fTools/tools/doSimplify.py,
-	python/plugins/fTools/tools/frmSimplify.ui: commit missing files for
-	new simplify implementation by alexbruy git-svn-id: http://svn.osgeo.org/qgis/trunk@14678
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix debian builds
 
-2010-11-15  cfarmer 
+Alexander Bruy 	2013-02-21
 
-	* python/plugins/fTools/fTools.py: change shortcut for vector menu
-	from V (and e) to t... again git-svn-id: http://svn.osgeo.org/qgis/trunk@14677
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Make "Layer - New" accesible from QgsInterface, update GPS importer
+    plugin (fix #7202)
 
-2010-11-15  cfarmer 
+Alexander Bruy 	2013-02-21
 
-	* python/plugins/fTools/fTools.py: change shortcut for vector menu
-	from V to e (conflict with View) git-svn-id: http://svn.osgeo.org/qgis/trunk@14676
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    different icons for GPS importer and Create new GPX layer (fix #6860)
 
-2010-11-15  brushtyler 
+Larry Shaffer 	2013-02-20
 
-	* python/plugins/GdalTools/GdalTools.py, src/app/qgisapp.cpp,
-	src/app/qgisapp.h: created the Raster menu and moved the "raster
-	calculator" to it git-svn-id: http://svn.osgeo.org/qgis/trunk@14675
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Print Composers submenu to new Composer menu in composer
+    
+    - Remove QgisApp::instance() usage in favor of already available passed in pointer to QgisApp
 
-2010-11-14  timlinux 
+Marco Hugentobler 	2013-02-20
 
-	* src/app/qgsvectorlayerproperties.cpp: Show more user friendly CRS
-	in vector props dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14674
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix WFS loading with geoserver layers
 
-2010-11-14  timlinux 
+Merge: 6355e9b ad7deec
+Jürgen Fischer 	2013-02-20
 
-	* src/app/qgsattributedialog.cpp: Remove field type indicators in
-	attribute form git-svn-id: http://svn.osgeo.org/qgis/trunk@14673
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #432 from matthias-kuhn/fix-vector-layer-signals
+    
+    Fix: emit committedFeaturesAdded and committedFeaturesRemoved
 
-2010-11-14  timlinux 
+Larry Shaffer 	2013-02-20
 
-	* src/app/qgsvectorlayerproperties.cpp: Also resize the alias column git-svn-id: http://svn.osgeo.org/qgis/trunk@14672
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Run prepare-commit on qgscomposer.cpp
 
-2010-11-14  brushtyler 
+Larry Shaffer 	2013-02-20
 
-	* src/plugins/oracle_raster/qgsoracle_plugin.cpp: moved "oracle
-	raster" plugin to the Database menu git-svn-id: http://svn.osgeo.org/qgis/trunk@14671
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add binding to iface for action to show composer manager
 
-2010-11-14  cfarmer 
+Larry Shaffer 	2013-02-20
 
-	* python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/frmJoinAttributes.ui: adds option to
-	specify encoding for input tables. addresses #2628 git-svn-id: http://svn.osgeo.org/qgis/trunk@14670
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add New and Manager actions to new Composer menu in composer
 
-2010-11-14  macho 
+Matthias Kuhn 	2013-02-20
 
-	* : update for splash screen .. hope the ugly frame is gone now git-svn-id: http://svn.osgeo.org/qgis/trunk@14669
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix: emit committedFeaturesAdded and committedFeaturesRemoved
 
-2010-11-14  timlinux 
+Larry Shaffer 	2013-02-20
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h: Fix broken activation of label
-	dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14668
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #7196, composer manager doesn't close when showing a chosen composer
+    
+    - Fix zoom-to-full when composer window is shown
 
-2010-11-14  timlinux 
+Marco Hugentobler 	2013-02-20
 
-	* src/ui/qgscontinuouscolordialogbase.ui,
-	src/ui/qgssinglesymboldialogbase.ui: Small ui tidy ups git-svn-id: http://svn.osgeo.org/qgis/trunk@14667
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement moving of snapped features together with the snap line
 
-2010-11-14  timlinux 
+Marco Hugentobler 	2013-02-20
 
-	* src/ui/qgsoptionsbase.ui: Remove stray shortcut indicator git-svn-id: http://svn.osgeo.org/qgis/trunk@14666
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve handling of snap lines
 
-2010-11-14  timlinux 
+Alexander Bruy 	2013-02-20
 
-	* src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h,
-	src/ui/qgsfieldcalculatorbase.ui: Automatically sample on field
-	calculator and gui tidy ups git-svn-id: http://svn.osgeo.org/qgis/trunk@14665
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    attempt to fix crash when changing symbols in graduated renderer
 
-2010-11-14  timlinux 
+Nathan Woodrow 	2013-02-20
 
-	* src/app/qgsvectorlayerproperties.cpp: Stretch table column in
-	attribute list git-svn-id: http://svn.osgeo.org/qgis/trunk@14664
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Updates to composer window
+    
+    - Split composer toolbar into many
+    - Rename File menu to Composer - because the composer isn't a "file"
 
-2010-11-14  brushtyler 
+Larry Shaffer 	2013-02-19
 
-	* src/plugins/grass/qgsgrassselect.cpp,
-	src/plugins/grass/qgsgrassselect.h,
-	src/plugins/grass/qgsgrassselectbase.ui: shrinked some GUIs, used
-	GUI guideline for Browse buttons text git-svn-id: http://svn.osgeo.org/qgis/trunk@14663
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix crash when loading a project that hits a group box with 'collapse' set
 
-2010-11-14  jef 
+Juergen E. Fischer 	2013-02-19
 
-	* src/app/main.cpp: reenabled menu icons - apparently some system
-	default was changed on desktop environments git-svn-id: http://svn.osgeo.org/qgis/trunk@14662
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-11-14  brushtyler 
+Juergen E. Fischer 	2013-02-19
 
-	* src/app/attributetable/qgsattributetabledialog.cpp: disable the
-	attribute table's "toggle editing" button when the layer is
-	read-only git-svn-id: http://svn.osgeo.org/qgis/trunk@14661
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging fix
 
-2010-11-14  brushtyler 
+Juergen E. Fischer 	2013-02-19
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassregion.cpp,
-	src/plugins/grass/qgsgrassregion.h,
-	src/plugins/grass/qgsgrassregionbase.ui: cleaned the "select region"
-	GUI for GRASS, fixed validation of input git-svn-id: http://svn.osgeo.org/qgis/trunk@14660
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Make QSPATIALITE optional, but still include it in osgeo4w and debian package
 
-2010-11-14  timlinux 
+Juergen E. Fischer 	2013-02-19
 
-	* src/app/qgisapp.cpp, src/app/qgslabelinggui.cpp,
-	src/app/qgslabelinggui.h, src/ui/qgslabelingguibase.ui: Added apply
-	button for label dialog for the lazy git-svn-id: http://svn.osgeo.org/qgis/trunk@14659
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] postgres provider: optionally skip columns without geometry type constraint
 
-2010-11-14  timlinux 
+Marco Hugentobler 	2013-02-19
 
-	* src/ui/qgslabelingguibase.ui: Added icons to labelling tabs git-svn-id: http://svn.osgeo.org/qgis/trunk@14658
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix copy paste bug
 
-2010-11-14  jef 
+Marco Hugentobler 	2012-12-24
 
-	* src/gui/qgsrubberband.cpp: revert accidental change git-svn-id: http://svn.osgeo.org/qgis/trunk@14657
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Compute min/max on demand in gdal provider
 
-2010-11-14  macho 
+Larry Shaffer 	2013-02-19
 
-	* : new trunk splash.. Wrozlaw Hackfest nearly over git-svn-id: http://svn.osgeo.org/qgis/trunk@14656
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add available sql drivers to Mac bundled app
 
-2010-11-14  jef 
+Sandro Santilli 	2013-02-19
 
-	* i18n/qgis_de.ts, src/gui/qgsrubberband.cpp: german translation
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@14655
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Revert "Enable topological editing on first TopoGeometry layer creation"
+    
+    This reverts commit edecf385fddd7d166e134023057998612af6ad58.
+    
+    The correct way to do this is by hooking on the editingStarted slot
+    (thanks jef for pointing that out)
 
-2010-11-14  macho 
+Marco Hugentobler 	2013-02-19
 
-	* TRANSLATORS, i18n/qgis_lv.ts: update translation: lv by peteris
-	and added correct name into TRANSLATORS git-svn-id: http://svn.osgeo.org/qgis/trunk@14654
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Snap to arbitrary snap lines
 
-2010-11-14  timlinux 
+Sandro Santilli 	2013-02-19
 
-	* src/ui/qgslabelingguibase.ui: Cleanups for label dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14653
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Enable topological editing on first TopoGeometry layer creation
+    
+    I'm not sure this is an acceptable behavior, but I'm sure users
+    do want to edit TopoGeometry layers in a topological way.
+    The problem with this implementation is that topological editing
+    is enabled for editing of every layer, not just the TopoGeometry
+    one.
 
-2010-11-14  jef 
+Larry Shaffer 	2013-02-15
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h: show
-	snapping menu entry also when docked git-svn-id: http://svn.osgeo.org/qgis/trunk@14652
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update composer ui files
+    
+    - Add section headers (should be moved to app stylesheet, and custom label or container class made)
+    - Enable map grid group box (was disabled)
+    - Reformat all form layouts to look like rest of app (more grid layout-like, with labels left-aligned and growing entry fields)
+    - Re-layout map extents group box
+    - Expand more group boxes by default (increases discovery)
 
-2010-11-14  timlinux 
+Larry Shaffer 	2013-02-14
 
-	* src/ui/qgslabelingguibase.ui: reverted to svn trunk of this file git-svn-id: http://svn.osgeo.org/qgis/trunk@14649
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix some compiler warnings
 
-2010-11-14  timlinux 
+olivierdalang 	2013-02-13
 
-	* src/app/qgsvectorlayerproperties.cpp: Tidy up table headers in vec
-	props dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14648
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    replaced "opacity" by "transparency" in the composer GUI
 
-2010-11-14  timlinux 
+olivierdalang 	2013-02-14
 
-	* src/ui/qgslabelingguibase.ui: In progress update of label dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14647
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add syncGroup to CollapsibleGroupBoxes
 
-2010-11-14  borysiasty 
+olivierdalang 	2013-02-12
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Alicja WÅ‚odarz git-svn-id: http://svn.osgeo.org/qgis/trunk@14645
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update of composer item's GUI
 
-2010-11-14  brushtyler 
+Larry Shaffer 	2013-02-15
 
-	* src/plugins/offline_editing/offline_editing_plugin.cpp: moved to
-	the new Database menu git-svn-id: http://svn.osgeo.org/qgis/trunk@14644
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Updates to QgsCollapsibleGroupBoxBasic
+    
+    - Use title instead of checkbox to define QgsCollapsibleGroupBox offset
+    - Fix error when group box has form layout with QPushButtons that refuse to fully hide
+    - Update vertical offsets for Ubuntu
+    - Add control-click modifier and tool tip for toggling all collapsible group boxes
+    - Ensure disclosure triangle mirrors enabled state of group box
 
-2010-11-14  jef 
+Juergen E. Fischer 	2013-02-19
 
-	* src/app/qgisapp.cpp: change toolbar toolbuttons to menupopups and
-	remember their last selection git-svn-id: http://svn.osgeo.org/qgis/trunk@14643
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7179
 
-2010-11-14  jef 
+Werner Macho 	2013-02-19
 
-	* src/plugins/delimited_text/qgsdelimitedtextplugin.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.h,
-	src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: improve
-	delimited text plugin ui and allow skipping lines git-svn-id: http://svn.osgeo.org/qgis/trunk@14642
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added malayalam language on request
 
-2010-11-14  brushtyler 
+Merge: dc074b3 7717aee
+Larry Shaffer 	2013-02-18
 
-	* src/gui/qgisinterface.h: database menu iface git-svn-id: http://svn.osgeo.org/qgis/trunk@14641
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #418 from dakcarto/cmake_stagedplugins-optmz_2
+    
+    Update stage-installed plugins CMakeLists.txt
 
-2010-11-14  cfarmer 
+Marco Hugentobler 	2013-02-18
 
-	* python/plugins/fTools/tools/doValidate.py: quick typo fix git-svn-id: http://svn.osgeo.org/qgis/trunk@14640
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Always use topological editing if using avoid intersection (where possible also to background layers). Without topological editing, it is possible to have very small gaps between the polygons
 
-2010-11-14  cfarmer 
+Marco Hugentobler 	2013-02-18
 
-	* python/plugins/fTools/tools/doValidate.py: patch from alexbruy to
-	make sure check_geometry works with current version of qgis
-	(previous commit required SIP SIP >= 4.9.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14639
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Show snap lines in ruler mouse move event
 
-2010-11-14  brushtyler 
+Juergen E. Fischer 	2013-02-18
 
-	* python/gui/qgisinterface.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h: added Database menu and related methods
-	add/remove plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@14638
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build with older Qt
 
-2010-11-14  borysiasty 
+Alexander Bruy 	2013-02-18
 
-	* src/app/qgsprojectproperties.cpp,
-	src/ui/qgsprojectpropertiesbase.ui: Fix QgsProjectProperties dialog
-	- first cpp patch from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14637
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix imports (addresses #7176)
 
-2010-11-14  timlinux 
+Alexander Bruy 	2013-02-18
 
-	* src/ui/qgsprojectpropertiesbase.ui: gui tweaks for project
-	properties git-svn-id: http://svn.osgeo.org/qgis/trunk@14635
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    disable SEXTANTE algorithms that require 3rd party Python modules
 
-2010-11-14  alexbruy 
+Alexander Bruy 	2013-02-18
 
-	* python/plugins/fTools/tools/doMergeShapes.py: Add warning when no
-	output file selected in the Merge tool in fTools. Fix #3210 git-svn-id: http://svn.osgeo.org/qgis/trunk@14634
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add CMakeLists.txt to SEXTANTE tools directory
 
-2010-11-14  timlinux 
+Marco Hugentobler 	2013-02-18
 
-	* src/ui/qgssymbolv2propertiesdialogbase.ui: Use nicer terms for
-	start and end colours git-svn-id: http://svn.osgeo.org/qgis/trunk@14633
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve coordinate display
 
-2010-11-14  mhugent 
+Juergen E. Fischer 	2013-02-18
 
-	* src/plugins/wfs/qgswfssourceselect.cpp,
-	src/providers/wfs/qgswfsdata.cpp, src/providers/wfs/qgswfsdata.h,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wfs/qgswfsprovider.h: Read wfs layer crs from url, not
-	from the GetFeature output git-svn-id: http://svn.osgeo.org/qgis/trunk@14632
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging fix
 
-2010-11-14  timlinux 
+Werner Macho 	2013-02-18
 
-	* src/ui/qgssymbollevelsv2dialogbase.ui: Small tweak to make symbol
-	layers dialog vaguely clearer sort of git-svn-id: http://svn.osgeo.org/qgis/trunk@14631
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    new language file on request: welcome Cambodia
 
-2010-11-14  brushtyler 
+Alexander Bruy 	2013-02-18
 
-	* src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassselect.cpp,
-	src/plugins/grass/qgsgrassselectbase.ui: refactored the addvector,
-	addraster and selectmapset GUI for the GRASS plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14630
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missed directory to CMakeLists.txt
+    disable StatisticsByCategories algorithm because it requires 3rd party
+    Python module scipy
 
-2010-11-14  timlinux 
+Juergen E. Fischer 	2013-02-18
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/ui/qgsrasterlayerpropertiesbase.ui: Updates for raster props
-	dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14629
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7172
 
-2010-11-14  pcav 
+Victor Olaya 	2013-02-17
 
-	* src/plugins/grass/modules-common/db-connect.1.svg,
-	src/plugins/grass/modules-common/db.connect.1.svg,
-	src/plugins/grass/modules-common/db.copy.1.svg,
-	src/plugins/grass/modules-common/db.execute.1.svg,
-	src/plugins/grass/modules-common/db.login.1.svg,
-	src/plugins/grass/themes/gis/grass_arrow.svg: More icons for GRASS
-	tools git-svn-id: http://svn.osgeo.org/qgis/trunk@14627
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] added tools to ease creating unit test for algorithms
 
-2010-11-13  brushtyler 
+Victor Olaya 	2013-02-17
 
-	* src/app/qgsabout.cpp: modified the donors page git-svn-id: http://svn.osgeo.org/qgis/trunk@14626
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] improved toolbox and modeler to better use classification by categories (easy mode)
 
-2010-11-13  jef 
+Victor Olaya 	2013-02-17
 
-	* src/app/qgssnappingdialog.cpp: fix typo - ouch git-svn-id: http://svn.osgeo.org/qgis/trunk@14625
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante]minor fixes and added new R script examples
 
-2010-11-13  borysiasty 
+Victor Olaya 	2013-02-17
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Henia Netzel (great
-	thanks to the new contributor) git-svn-id: http://svn.osgeo.org/qgis/trunk@14624
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [sextante] Log file is now read backwards and limited to a fixed number of lines
 
-2010-11-13  jef 
+Victor Olaya 	2013-02-16
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp,
-	src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h,
-	src/app/qgssnappingdialog.cpp, src/app/qgssnappingdialog.h,
-	src/ui/qgsoptionsbase.ui, src/ui/qgsprojectpropertiesbase.ui,
-	src/ui/qgssnappingdialogbase.ui: apply #3206 git-svn-id: http://svn.osgeo.org/qgis/trunk@14623
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    cleaned SEXTANTE/SAGA algorithms
 
-2010-11-13  timlinux 
+Victor Olaya 	2013-02-16
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h,
-	src/ui/qgsvectorlayerpropertiesbase.ui: Cleanups for vector layer
-	properties git-svn-id: http://svn.osgeo.org/qgis/trunk@14622
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    addded new SEXTANTE python algorithms
 
-2010-11-13  brushtyler 
+Victor Olaya 	2013-02-16
 
-	* src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/plugins/grass/qgsgrasstoolsbase.ui,
-	src/plugins/grass/themes/gis/grass_arrow.svg: adjusted GRASS list
-	GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@14621
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    improved management of tables in SEXTANTE
 
-2010-11-13  wonder 
+Juergen E. Fischer 	2013-02-17
 
-	* src/ui/qgsgraduatedsymboldialogbase.ui: Better default value for
-	the number of classes in graduated symbol renderer (old symbology) git-svn-id: http://svn.osgeo.org/qgis/trunk@14620
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7172 and #7174
 
-2010-11-13  mhugent 
+Juergen E. Fischer 	2013-02-17
 
-	* src/app/qgsrasterlayerproperties.cpp: Patch from Volker Froehlich.
-	Fixes ticket #2252 git-svn-id: http://svn.osgeo.org/qgis/trunk@14618
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] add qspatialite sql driver plugin
 
-2010-11-13  brushtyler 
+Marco Hugentobler 	2013-02-17
 
-	* src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp: Better png arrow and + sign for
-	GRASS git-svn-id: http://svn.osgeo.org/qgis/trunk@14617
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consider multiple pages for ruler scale
 
-2010-11-13  alexbruy 
+Marco Hugentobler 	2013-02-17
 
-	* python/plugins/fTools/tools/doMergeShapes.py,
-	python/plugins/fTools/tools/frmMergeShapes.ui: option to select
-	separate shapefiles for merging with fTools git-svn-id: http://svn.osgeo.org/qgis/trunk@14616
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Store reference to composition in ruler to get page info
 
-2010-11-13  timlinux 
+Radim Blazek 	2013-02-17
 
-	* src/app/qgsoptions.cpp, src/ui/qgsoptionsbase.ui: Tidy up for the
-	options window to use top tabs as per gui discussion at Wroclaw
-	Hackfest git-svn-id: http://svn.osgeo.org/qgis/trunk@14614
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WMS identify format preference order: Html,Feature,Text
 
-2010-11-13  kyngchaos 
+Radim Blazek 	2013-02-17
 
-	* mac/cmake/0qgis.cmake.in, mac/cmake/1qt.cmake.in: executable_path
-	for pyqt bin git-svn-id: http://svn.osgeo.org/qgis/trunk@14613
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Html identify result print fix
 
-2010-11-13  kyngchaos 
+Juergen E. Fischer 	2013-02-17
 
-	* cmake/MacBundleMacros.cmake, mac/cmake/0qgis.cmake.in,
-	mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in,
-	mac/cmake/3fw.cmake.in: fix bundling for latest cmake git-svn-id: http://svn.osgeo.org/qgis/trunk@14612
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7171
 
-2010-11-13  pcav 
+Juergen E. Fischer 	2013-02-16
 
-	* src/plugins/grass/modules-common/r.distance.qgm,
-	src/plugins/grass/themes/gis/grass_arrow.svg,
-	src/plugins/grass/themes/gis/grass_plus.svg: Better arrow and + for
-	GRASS, and more git-svn-id: http://svn.osgeo.org/qgis/trunk@14611
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    also optionally apply SHAPE_ENCODING to layer creation (fixes #5911)
 
-2010-11-13  mhugent 
+Arunmozhi 	2013-02-16
 
-	* src/app/qgsrasterlayerproperties.cpp: Use validator for nodata
-	line edit git-svn-id: http://svn.osgeo.org/qgis/trunk@14610
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added searching of colorramps in style manager
 
-2010-11-13  timlinux 
+Juergen E. Fischer 	2013-02-15
 
-	* src/ui/qgsrendererv2propsdialogbase.ui: Remove the word renderer
-	from the vector props dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14609
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7160
 
-2010-11-13  timlinux 
+Juergen E. Fischer 	2013-02-15
 
-	* src/ui/qgsaddattrdialogbase.ui: Use add column for consistency git-svn-id: http://svn.osgeo.org/qgis/trunk@14608
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    quote closing parens within column names (fixes #7159)
 
-2010-11-13  timlinux 
+Merge: c1527af 2e84efa
+mhugent 	2013-02-15
 
-	* src/ui/qgsannotationwidgetbase.ui: Fix grammar on label git-svn-id: http://svn.osgeo.org/qgis/trunk@14607
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #428 from schmandr/master
+    
+    Add support for 1bit PNG format to QGIS Server WMS
 
-2010-11-13  cfarmer 
+Andreas Schmid 	2013-02-15
 
-	* python/plugins/fTools/fTools.py,
-	python/plugins/fTools/tools/doValidate.py,
-	python/plugins/fTools/tools/doVisual.py: [FEATURE] completely new
-	geometry checking tool for fTools. Significantly (big time) faster,
-	more relevant error messages, and now supports zooming to errors.
-	Thanks to jef for the new QgsGeometry.validateGeometry function.
-	Fixes #3169 and #2611.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14606
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add support for 1bit PNG format to QGIS Server WMS
 
-2010-11-13  wonder 
+Alexander Bruy 	2013-02-15
 
-	* src/gui/symbology-ng/qgsstylev2managerdialog.cpp: Refresh the
-	style manager only when a change has been done to it.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14604
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    also fix loading checkbox state from settings
 
-2010-11-13  kyngchaos 
+Alexander Bruy 	2013-02-15
 
-	* INSTALL, doc/osx.t2t, src/mac/Contents/CMakeLists.txt: add missing
-	configure option; fix mac build for release source git-svn-id: http://svn.osgeo.org/qgis/trunk@14602
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix handling of TAB delimiter in delimited text plugin
 
-2010-11-13  jef 
+Marco Hugentobler 	2013-02-14
 
-	* src/analysis/interpolation/qgsinterpolator.cpp,
-	src/analysis/interpolation/qgstininterpolator.cpp, src/core/qgis.h,
-	src/core/qgsclipper.h: add isnan to qgis.h git-svn-id: http://svn.osgeo.org/qgis/trunk@14601
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Show ruler marker for cursor position
 
-2010-11-13  pcav 
+Marco Hugentobler 	2013-02-14
 
-	* src/plugins/grass/modules-common/db.copy.1.svg,
-	src/plugins/grass/modules-common/r.walk.coord.qgm,
-	src/plugins/grass/modules-common/r.walk.vect.qgm: More tuning to the
-	grass toolbox git-svn-id: http://svn.osgeo.org/qgis/trunk@14600
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better placement for y-coordinate labels
 
-2010-11-13  jef 
+Marco Hugentobler 	2013-02-14
 
-	* images/images.qrc, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptooladdfeature.h,
-	src/app/qgsoptions.cpp, src/core/qgsvectorlayer.cpp,
-	src/ui/qgsoptionsbase.ui: [FEATURE] improve attribute handling - optionally reuse entered attribute values for next digitized
-	feature - allow merging/assigning attribute values to a set of features git-svn-id: http://svn.osgeo.org/qgis/trunk@14599
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Read composer from xml considers rulers
 
-2010-11-13  jef 
+Marco Hugentobler 	2013-02-14
 
-	* src/CMakeLists.txt: missed a file in r14597.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14598
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix calculation of ruler y-coordinates
 
-2010-11-13  jef 
+Marco Hugentobler 	2013-02-14
 
-	* CODING, doc/CODING.t2t, doc/build.sh, scripts/astyle.sh,
-	src/astyle/ASBeautifier.cpp, src/astyle/ASEnhancer.cpp,
-	src/astyle/ASFormatter.cpp, src/astyle/ASResource.cpp,
-	src/astyle/CMakeLists.txt, src/astyle/astyle.h,
-	src/astyle/astyle_main.cpp, src/astyle/license.html: add old astyle
-	version, adapt prepare-commit.sh to it and include it in the CODING
-	guide git-svn-id: http://svn.osgeo.org/qgis/trunk@14597
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Don't draw view frame (alignment with ruler widgets)
 
-2010-11-13  pcav 
+Juergen E. Fischer 	2013-02-14
 
-	* src/plugins/grass/modules-common/db.connect.1.svg,
-	src/plugins/grass/modules-common/db.copy.1.svg: Improving the
-	appearance of GRASS toolbox - take 3: first new icons from Robert
-	Szczepanek git-svn-id: http://svn.osgeo.org/qgis/trunk@14596
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ocispatial: require OCI library
 
-2010-11-13  brushtyler 
+Larry Shaffer 	2013-02-13
 
-	* src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/plugins/grass/qgsgrasstoolsbase.ui: Improving the appearance of
-	GRASS toolbox - take 2 git-svn-id: http://svn.osgeo.org/qgis/trunk@14594
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add collapse toggling synchronization on Alt-click of title to QgsCollapsibleGroupBoxBasic
 
-2010-11-13  pcav 
+Juergen E. Fischer 	2013-02-13
 
-	* src/plugins/grass/modules-common/r.cost.qgm: Followup of r14591 -
-	some icons done git-svn-id: http://svn.osgeo.org/qgis/trunk@14593
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-11-13  pcav 
+Larry Shaffer 	2013-02-11
 
-	* src/plugins/grass/modules-6.3/default.qgc,
-	src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-common/r.cost.coord.qgm,
-	src/plugins/grass/modules-common/r.cost.rast.qgm,
-	src/plugins/grass/modules-common/r.cost.vect.qgm,
-	src/plugins/grass/modules-common/r.distance.qgm,
-	src/plugins/grass/modules-common/r.walk.coord.qgm,
-	src/plugins/grass/modules-common/r.walk.vect.qgm: Added several
-	GRASS modules - thanks Maciej Sieczka. Icons still missing, TBD git-svn-id: http://svn.osgeo.org/qgis/trunk@14591
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Make measure tool dialogs stay on top of other windows during operation
+    
+    - Not tested with X11, may need Qt::X11BypassWindowManagerHint too
 
-2010-11-13  pcav 
+Larry Shaffer 	2013-02-12
 
-	* src/plugins/grass/qgsgrassmodule.cpp: Improving the appearance of
-	GRASS toolbox - take 1 git-svn-id: http://svn.osgeo.org/qgis/trunk@14585
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add collapse toggling synchronization to QgsCollapsibleGroupBoxBasic
+    
+    - Holding Alt modifier key when toggling collapsed state will synchronize the toggling across other boxes with the same syncGroup QString value
+    - Synchronizes boxes of same syncGroup via recursive search in parent or grandparent widget (if grandparent is not QgisApp)
 
-2010-11-13  jef 
+Merge: 8e11e5f 42dad85
+mhugent 	2013-02-12
 
-	* src/ui/qgsattributetabledialog.ui: apply #1468 git-svn-id: http://svn.osgeo.org/qgis/trunk@14582
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #427 from matthias-kuhn/rubberband-doc
+    
+    Documentation update for QgsRubberband
 
-2010-11-13  borysiasty 
+Matthias Kuhn 	2013-02-12
 
-	* python/plugins/plugin_installer/installer_data.py: Plugin
-	installer - fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@14581
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Documentation update for QgsRubberband
 
-2010-11-13  jef 
+Merge: b45d8cb d1a05f7
+mhugent 	2013-02-12
 
-	* cmake/FindIconv.cmake, src/core/spatialindex/include/Tools.h,
-	src/core/spatialindex/rtree/BulkLoader.cc,
-	src/core/spatialindex/storagemanager/DiskStorageManager.cc,
-	src/core/spatialindex/tools/ExternalSort.cc,
-	src/core/spatialindex/tools/TemporaryFile.cc: apply #2999 git-svn-id: http://svn.osgeo.org/qgis/trunk@14580
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #422 from Oslandia/atlas
+    
+    Feature sorting and filtering for atlas generation
 
-2010-11-12  borysiasty 
+Marco Hugentobler 	2013-02-12
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/qgsplugininstallerbase.ui: Plugin
-	Installer update. New features: Upgrade All button, plugin count in
-	the window title and Horst's repository git-svn-id: http://svn.osgeo.org/qgis/trunk@14577
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Snap to paper items and consider multipage compositions when showing snap lines
 
-2010-11-12  timlinux 
+Larry Shaffer 	2013-02-11
 
-	* src/ui/qgsoptionsbase.ui: Updates from Wroclaw hackfest to let the
-	vector properties dialog fit on a small screen git-svn-id: http://svn.osgeo.org/qgis/trunk@14572
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Split QgsCollapsibleGroupBox into basic class and subclass that auto-saves collapsed state
+    
+    - Split authored by Etienne Tourigny
+    - Add Q_PROPERTY declarations to make some class properties settable for promoted widget in QtDesigner (by Olivier Dalang)
+    - Update existing .ui files with dynamic properties (but not saveCheckedState, which should be cautiously used)
+    - Update sip file so both classes are available
 
-2010-11-12  wonder 
+Alexander Bruy 	2013-02-11
 
-	* python/utils.py: Handle non-ascii characters in traceback when
-	showing an exception git-svn-id: http://svn.osgeo.org/qgis/trunk@14571
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    missed comma
 
-2010-11-12  pcav 
+Alexander Bruy 	2013-02-11
 
-	* i18n/qgis_it.ts: Minor updates to the IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14565
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix issues with non-ASCII filenames in GDALTools, thanks to Evgenia for
+    pointing on this problem
 
-2010-11-12  jef 
+Larry Shaffer 	2013-02-10
 
-	* python/core/qgsvectorfilewriter.sip,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.h,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h,
-	src/ui/qgsvectorlayersaveasdialogbase.ui: [FEATURE] allow OGR save
-	as without attributes (for eg. DGN/DXF) git-svn-id: http://svn.osgeo.org/qgis/trunk@14562
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use new vector edit macro support to batch Show/Hide Label tool's operation
 
-2010-11-12  mwalker 
+Larry Shaffer 	2013-02-10
 
-	* src/plugins/offline_editing/offline_editing_plugin_gui.cpp,
-	src/plugins/offline_editing/offline_editing_plugin_gui.h,
-	src/plugins/offline_editing/offline_editing_plugin_guibase.ui: 
-	Offline editing plugin: add option to filter editable remote layers
-	using capabilities git-svn-id: http://svn.osgeo.org/qgis/trunk@14560
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Limit canvas redraws when working with vector layer undo stack
+    
+    - Fix unreported bug where clicking on group in legend would clear previously selected vector layer's undo stack
+    - Ensure empty view is created on project load (cosmetic)
 
-2010-11-12  jef 
+Larry Shaffer 	2013-02-10
 
-	* qgis_help.1: fix 8bit character in qgis_help git-svn-id: http://svn.osgeo.org/qgis/trunk@14558
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update vector layer edits rollback method and app rollback actions
+    
+    - Make optional whether edit buffer is deleted
+    - Returns optional functionality where rollback was similar to setting undo stack to index 0
 
-2010-11-12  mhugent 
+Juergen E. Fischer 	2013-02-10
 
-	* src/app/qgsfieldcalculator.cpp: Continue field calculation upon
-	error only for division through zero git-svn-id: http://svn.osgeo.org/qgis/trunk@14557
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] allow filter expressions in value relations (and fix display of related values and value maps in attribute table)
 
-2010-11-12  timlinux 
+Juergen E. Fischer 	2013-02-10
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/ui/qgssymbolv2selectordialogbase.ui: Hello from Wroclaw QGIS
-	Hackfest November 2010! Tidy up for vector symbology dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14556
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-11-12  jef 
+Juergen E. Fischer 	2013-02-10
 
-	* src/app/qgisapp.cpp: save last used selection tool git-svn-id: http://svn.osgeo.org/qgis/trunk@14555
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wms: improve xsd/gml detection on getfeatureinfo
 
-2010-11-12  mhugent 
+Juergen E. Fischer 	2013-02-10
 
-	* src/core/qgsclipper.h: Catch nans and infs in clipper. Fixes #3081 git-svn-id: http://svn.osgeo.org/qgis/trunk@14554
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wms: catch service exception on GetFeatureInfo and use feature extent if there's no geometry
 
-2010-11-12  wonder 
+Juergen E. Fischer 	2013-02-09
 
-	* src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: Fix a crash
-	in Symbol properties dialog when removed a layer. (#2995) git-svn-id: http://svn.osgeo.org/qgis/trunk@14553
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #7125
 
-2010-11-12  jef 
+Larry Shaffer 	2013-02-09
 
-	* debian/rules, ms-windows/osgeo4w/package.cmd: compile debian and
-	osgeo4w package with mapserver (default changed) git-svn-id: http://svn.osgeo.org/qgis/trunk@14552
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add option to show canvas refresh event in Log Message panel
+    
+    - In Options at bottom of Rendering tab
+    - Useful for debugging excessive refreshes from userspace without having to build with debug and filter logs
+    - Records time taken for refresh and any resolvable sender class
 
-2010-11-12  wonder 
+Juergen E. Fischer 	2013-02-09
 
-	* CMakeLists.txt: Turn off compilation of map server by default (so
-	that fastcgi is not required by default) git-svn-id: http://svn.osgeo.org/qgis/trunk@14551
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ftools api update (fixes #7130)
 
-2010-11-12  pcav 
+Merge: 5967db9 8303a47
+Giuseppe Sucameli 	2013-02-09
 
-	* src/plugins/grass/modules-common/v.in.ascii.qgm: Minor improvement
-	to a GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@14550
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #424 from slarosa/fix_rubber_band_python_plugins
+    
+    Fixes rubberBand for extent selection in gdal_clipper and sextante algs
 
-2010-11-12  mhugent 
+Larry Shaffer 	2013-02-08
 
-	* src/app/composer/qgscomposermapwidget.cpp,
-	src/app/composer/qgscomposermapwidget.h,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h,
-	src/ui/qgscomposermapwidgetbase.ui: Add option to turn on / off
-	printing of canvas item in composer map (ticket #2734) git-svn-id: http://svn.osgeo.org/qgis/trunk@14549
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix Show/Hide Labels to allow NULL values in table to work for show value
 
-2010-11-12  wonder 
+Larry Shaffer 	2013-02-08
 
-	* Doxyfile: Added QgsSpatialIndex to QGIS API (#3198).  git-svn-id: http://svn.osgeo.org/qgis/trunk@14548
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update QgsMapToolShowHideLabels to work with new vector api
+    
+    - Works now, but should have worked before this fix
 
-2010-11-11  rduivenvoorde 
+Salvatore Larosa 	2013-02-08
 
-	* python/plugins/mapserver_export/ms_export.py: no OUTLINECOLOR if
-	outlinestyle is None (thanks Michele De Santis) git-svn-id: http://svn.osgeo.org/qgis/trunk@14547
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixes rubberBand for extent selection in gdal_clipper and sextante algs
 
-2010-11-11  pcav 
+Marco Hugentobler 	2013-02-08
 
-	* src/plugins/grass/modules-6.3/default.qgc,
-	src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-common/resize_grass,
-	src/plugins/grass/modules-common/v.in.ascii.qgm,
-	src/plugins/grass/modules-common/v.net.iso.qgm: Improvements to the
-	GRASS toolbox - take 1 from the hackfest git-svn-id: http://svn.osgeo.org/qgis/trunk@14546
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better approach to split lines. Fixes bug #4618
 
-2010-11-11  borysiasty 
+Juergen E. Fischer 	2013-02-08
 
-	* python/plugins/osm/OsmDatabaseManager.py,
-	python/plugins/osm/OsmPlugin.py: fix Python error when unloading the
-	OSM plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14545
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-11-11  brushtyler 
+Larry Shaffer 	2013-02-07
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/dialogBase.py,
-	python/plugins/GdalTools/tools/doSettings.py: Allow users to open
-	the local gdal documentation by clicking on the Help button, to fix
-	#3040 git-svn-id: http://svn.osgeo.org/qgis/trunk@14544
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add images/theme_originals directory
+    
+    - Helps with conversion of interface graphics to SVG
 
-2010-11-11  timlinux 
+Radim Blazek 	2013-02-08
 
-	* : Show something different for trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@14543
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    GML GetFeatureInfo XSD validation, disabled
 
-2010-11-11  borysiasty 
+Victor Olaya 	2013-02-07
 
-	* i18n/qgis_pl_PL.ts: Part 2 of first HF commit (previously gui
-	cleaning, now translation update) - patches from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14542
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    better raster support in R/SEXTANTE
 
-2010-11-11  borysiasty 
+Victor Olaya 	2013-02-07
 
-	* python/plugins/GdalTools/tools/widgetBuildVRT.ui,
-	python/plugins/GdalTools/tools/widgetClipper.ui,
-	python/plugins/GdalTools/tools/widgetContour.ui,
-	python/plugins/GdalTools/tools/widgetConvert.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetInfo.ui,
-	python/plugins/GdalTools/tools/widgetMerge.ui,
-	python/plugins/GdalTools/tools/widgetNearBlack.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPolygonize.ui,
-	python/plugins/GdalTools/tools/widgetProjection.ui,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetSieve.ui,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui,
-	python/plugins/fTools/tools/frmPointDistance.ui,
-	python/plugins/fTools/tools/frmReProject.ui,
-	python/plugins/fTools/tools/frmSpatialJoin.ui: git-svn-id:
-	http://svn.osgeo.org/qgis/trunk@14541
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more fixes in python sextante algorithms
 
-2010-11-10  jef 
+Victor Olaya 	2013-02-07
 
-	* debian/changelog: fix debian version git-svn-id: http://svn.osgeo.org/qgis/trunk@14540
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #7116
 
-2010-11-09  mhugent 
+Larry Shaffer 	2013-02-07
 
-	* src/providers/wfs/qgswfsdata.cpp: Improve geometry type detection
-	for wfs git-svn-id: http://svn.osgeo.org/qgis/trunk@14539
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix typo in QgsPalLabeling
 
-2010-11-09  macho 
+Larry Shaffer 	2013-02-06
 
-	* i18n/qgis_ja.ts, resources/context_help/QgsIdentifyResults-es_ES,
-	resources/context_help/QgsNewSpatialiteLayerDialog-es_ES,
-	resources/context_help/QgsScaleBarPluginGui-es_ES: translation
-	update: .ja by Yoichi and some context files in .es by Carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@14538
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update QgsPalLabeling to work with new vector api
+    
+    - Switch data defined properties from field index- to name-based
+    - Add routine to migrate properties to new keys:  labeling/dataDefined/[enum name]
+    - Add QHash containing old-style data provider mapping of index to name for use in properties migration
+    - Update QgsLabelingGui, QgsMapToolLabel, QgsLabelPropertyDialog to work with name-based properties
 
-2010-11-08  cfarmer 
+Merge: 863da7d d97f05e
+Radim Blazek 	2013-02-07
 
-	* python/plugins/fTools/tools/doGeoprocessing.py: updates to union
-	tool: more checks on GEOS processing; when geometry collection
-	created, take only relevant geometries; should address #3071 (and
-	possibly #3013); also adds ability to run almost all geoprocessing
-	tools on almost all geometry types git-svn-id: http://svn.osgeo.org/qgis/trunk@14537
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge remote branch '3nids/maptoolidentify_returnresults'
 
-2010-11-08  cfarmer 
+Marco Hugentobler 	2013-02-07
 
-	* python/plugins/fTools/tools/doGeometry.py: quick fix for exporting
-	the geometry of 2.5D features, fixes #3149 git-svn-id: http://svn.osgeo.org/qgis/trunk@14536
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve performance of vector reprojection by transforming the coordinates of a feature together
 
-2010-11-08  jef 
+Juergen E. Fischer 	2013-02-07
 
-	* CMakeLists.txt, debian/changelog: update version number git-svn-id: http://svn.osgeo.org/qgis/trunk@14534
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    postgres provider: only record active iterator, when it's open (fixes crash on labeling non-existing attributes)
 
-2010-11-08  jef 
+Denis Rouzaud 	2013-02-07
 
-	* resources/context_help/QgsFieldCalculator-en_US,
-	src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h, src/ui/qgsfieldcalculatorbase.ui: 
-	[FEATURE] add field calculator functions (implements #3177) - add support for functions with 2 or three arguments - add function atan2(y,x) - add length(string) to determine string length - add replace(string,from,to) to do string replaces - add substr(string,from,length) to retrieve substrings - add (preliminary) online help to field calculator with a listing
-	of operations.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14533
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix SLOT
 
-2010-11-08  jef 
+Juergen E. Fischer 	2013-02-07
 
-	* src/ui/qgsrasterlayerpropertiesbase.ui: reset default page for
-	raster properties dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14532
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warning
 
-2010-11-08  macho 
+Denis Rouzaud 	2013-02-07
 
-	* i18n/qgis_bg.ts: translation update: bg by Zahari git-svn-id: http://svn.osgeo.org/qgis/trunk@14530
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    unifying identify results in a single struct
 
-2010-11-08  macho 
+Denis Rouzaud 	2013-02-07
 
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@14529
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    updated class name
 
-2010-11-07  macho 
+Denis Rouzaud 	2013-02-05
 
-	* i18n/qgis_es.ts: translation update: last minute update for es by
-	carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@14528
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    return results directly from the identify method instead of using a private attribute
 
-2010-11-07  pcav 
+Hugo Mercier 	2013-02-07
 
-	* i18n/qgis_it.ts: Updated it GUI translation - almost complete git-svn-id: http://svn.osgeo.org/qgis/trunk@14527
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Replace the sort direction combobox by a up/down button
 
-2010-11-07  jef 
+Juergen E. Fischer 	2013-02-07
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/legend/qgslegendgroup.cpp, src/app/legend/qgslegendgroup.h: 
-	more legend refactoring to fix it git-svn-id: http://svn.osgeo.org/qgis/trunk@14526
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2010-11-07  borysiasty 
+Juergen E. Fischer 	2013-02-07
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14525
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ftools api updates
 
-2010-11-07  macho 
+Victor Olaya 	2013-02-06
 
-	* i18n/qgis_pt_BR.ts: translation update: pt_BR by Arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@14524
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added explicit CRS checking in sextante algorithms
 
-2010-11-06  jef 
+Victor Olaya 	2013-02-06
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/legend/qgslegendgroup.cpp: fix legend git-svn-id: http://svn.osgeo.org/qgis/trunk@14523
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed bug in mmqgis/ftools algs in sextante after adaptation to new vector api
 
-2010-11-06  borysiasty 
+Hugo Mercier 	2013-02-06
 
-	* images/images.qrc: fix georeferencer plugin gis style icon - patch
-	from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14522
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Fix minor UI behaviour
 
-2010-11-06  borysiasty 
+Hugo Mercier 	2013-02-06
 
-	* i18n/qgis_pl_PL.ts: Translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14521
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add i18n to error messages
 
-2010-11-06  macho 
+Hugo Mercier 	2013-02-06
 
-	* i18n/qgis_zh_TW.ts: translation update: zh_TW by yao git-svn-id: http://svn.osgeo.org/qgis/trunk@14520
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Restore painting on error return
 
-2010-11-06  macho 
+Radim Blazek 	2013-02-06
 
-	* TRANSLATORS, i18n/qgis_hu.ts, i18n/qgis_sl_SI.ts: translation
-	update: Slovenian by Joze and Hungarian by Siki Zoltan git-svn-id: http://svn.osgeo.org/qgis/trunk@14519
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsMapToolIdentifyAction cleanup
 
-2010-11-06  pcav 
+Merge: 81d865a ec634a2
+Nathan Woodrow 	2013-02-06
 
-	* src/plugins/grass/modules-6.3/default.qgc,
-	src/plugins/grass/modules-6.4/g.proj.wkt.qgm,
-	src/plugins/grass/modules-common/g.proj.wkt.qgm: Moved g.proj.wkt
-	GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@14518
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #413 from olivierdalang/labelCanDisplayHtml
+    
+    [Feature] add HTML capabilities to composer labels
 
-2010-11-05  mhugent 
+Merge: 50d4bb6 b642722
+Nathan Woodrow 	2013-02-06
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Better handling of
-	relative / absolute pathes for fill symbol layer. Fixes bug #3154 git-svn-id: http://svn.osgeo.org/qgis/trunk@14515
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #408 from olivierdalang/showBackgroundCheckboxForComposerItem
+    
+    [feature] added draw background checkbox in composer items
+    Fix #6389
 
-2010-11-05  timlinux 
+Radim Blazek 	2013-02-06
 
-	* INSTALL, doc/build.sh, doc/index.html, doc/msvc.t2t: Small tweaks
-	to docs git-svn-id: http://svn.osgeo.org/qgis/trunk@14514
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WMS identify feature support - get vector features from GML GetFeatureInfo
 
-2010-11-05  brushtyler 
+Hugo Mercier 	2013-02-06
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doMerge.py: split extent on comma in
-	GdalTools Merge tool, to fix #3092 git-svn-id: http://svn.osgeo.org/qgis/trunk@14513
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add Python unit tests for feature sorting and filtering
 
-2010-11-04  jef 
+Hugo Mercier 	2013-02-06
 
-	* src/analysis/raster/qgsrastercalculator.cpp,
-	src/analysis/raster/qgsrastermatrix.cpp: fix vc warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14508
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add SIP bindings for feature sorting and filtering
 
-2010-11-04  jef 
+olivierdalang 	2013-02-06
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: fix
-	#3188 git-svn-id: http://svn.osgeo.org/qgis/trunk@14507
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added a kind of oversampling for labels when rendered as HTML
 
-2010-11-04  borysiasty 
+Juergen E. Fischer 	2013-02-06
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@14506
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    also verify wkbSize in QgsGeometry::exportToWkt
 
-2010-11-04  borysiasty 
+Hugo Mercier 	2013-02-06
 
-	* i18n/qgis_pl_PL.ts: translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14505
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add unit tests for sorting and filtering
 
-2010-11-04  macho 
+Hugo Mercier 	2013-02-06
 
-	* i18n/qgis_lv.ts: translation update: lv by Maris git-svn-id: http://svn.osgeo.org/qgis/trunk@14504
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add better exception handling
 
-2010-11-04  mhugent 
+Hugo Mercier 	2013-02-06
 
-	* src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalculator.cpp,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/analysis/raster/qgsrastermatrix.h,
-	src/ui/qgsrastercalcdialogbase.ui: Fix consideration of nodata
-	values in raster calculator, code cleanups git-svn-id: http://svn.osgeo.org/qgis/trunk@14503
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add UI management for feature sorting and filtering
 
-2010-11-04  macho 
+Hugo Mercier 	2013-02-05
 
-	* i18n/qgis_ru.ts: translation update: ru by artem git-svn-id: http://svn.osgeo.org/qgis/trunk@14502
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Add feature sorting and filtering
 
-2010-11-04  kyngchaos 
+Hugo Mercier 	2013-02-05
 
-	* mac/CMakeLists.txt, mac/cmake/0qgis.cmake.in,
-	mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in,
-	mac/cmake/3fw.cmake.in, src/helpviewer/CMakeLists.txt: support
-	DESTDIR in bundling git-svn-id: http://svn.osgeo.org/qgis/trunk@14501
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [Atlas] Remove cout
 
-2010-11-03  jef 
+olivierdalang 	2013-02-06
 
-	* src/app/qgssinglesymboldialog.cpp,
-	src/ui/qgssinglesymboldialogbase.ui: also use pixmap cache in old
-	symbology git-svn-id: http://svn.osgeo.org/qgis/trunk@14500
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    rechange the basic resolution
 
-2010-11-03  wonder 
+olivierdalang 	2013-02-06
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/ui/symbollayer/widget_svgfill.ui,
-	src/ui/symbollayer/widget_svgmarker.ui: Further improvements in the
-	speed when opening symbol properties dialog (symbology-ng) git-svn-id: http://svn.osgeo.org/qgis/trunk@14499
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set html's background to transparent
 
-2010-11-03  jef 
+olivierdalang 	2013-02-06
 
-	* src/core/qgsattributeaction.cpp: fix attribute replacement in
-	actions git-svn-id: http://svn.osgeo.org/qgis/trunk@14498
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed tab width of QPlainTextEdit in QComposerLabelWidget (easier to read for html)
 
-2010-11-03  mhugent 
+Juergen E. Fischer 	2013-02-06
 
-	* src/app/qgsmaptoolselect.cpp, src/app/qgsmaptoolselectutils.cpp,
-	src/app/qgsmaptoolselectutils.h: Apply non-string parts of patch
-	#2938 git-svn-id: http://svn.osgeo.org/qgis/trunk@14497
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fTools: fix add/export geometry columns
 
-2010-11-03  borysiasty 
+Marco Hugentobler 	2013-02-05
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14496
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix ticket #5584 (crash saving empty geometry)
 
-2010-11-02  borysiasty 
+Juergen E. Fischer 	2013-02-05
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@14495
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warning
 
-2010-11-02  mmassing 
+Marco Hugentobler 	2013-02-05
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: Remove
-	unused QDebug include.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14494
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix double redraw after applying vector properties
 
-2010-11-02  mmassing 
+Nathan Woodrow 	2013-02-05
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: Addendum
-	to r14491 / ticket #3141 which addresses the root cause of the
-	problem.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14493
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add GUI_EXPORT to identify map tool
 
-2010-11-02  jef 
+Denis Rouzaud 	2013-02-04
 
-	* src/core/qgsvectorfilewriter.cpp: fix filewriter crash git-svn-id: http://svn.osgeo.org/qgis/trunk@14492
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove useless funcs from sip
 
-2010-11-02  alexbruy 
+Denis Rouzaud 	2013-01-25
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: fix
-	georeferencer transformation type dropdown menu (#3141).  Patch from
-	lynxID - thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14491
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    MapToolIdentify moved to gui to make it accessible in python
+    
+    put back convertMeasurement in gui as it is not app specific
+    
+    use display settings for specific app units
 
-2010-11-02  jef 
+Juergen E. Fischer 	2013-02-05
 
-	* src/providers/ogr/qgsogrprovider.cpp: fix #2903 git-svn-id: http://svn.osgeo.org/qgis/trunk@14490
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warning
 
-2010-11-01  macho 
+Victor Olaya 	2013-02-04
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@14489
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Finished adapting sextante python algorithms to new vector API
+    Some code cleaning
 
-2010-11-01  macho 
+Marco Hugentobler 	2013-02-04
 
-	* i18n/qgis_hr_HR.ts: translation update: and the first response
-	hr_HR by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@14488
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Show more verbose error message (ticket #7095)
 
-2010-11-01  macho 
+Merge: 93dbfd7 8a880ca
+Victor Olaya 	2013-02-04
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sl_SI.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts,
-	i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: translation
-	update: string update for all languages to prepare freeze (already
-	frozen?) git-svn-id: http://svn.osgeo.org/qgis/trunk@14487
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-11-01  jef 
+Victor Olaya 	2013-02-04
 
-	* i18n/qgis_de.ts, src/app/qgisapp.cpp: what's new fix and german
-	translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14486
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    started adapting sextante to new vector api
 
-2010-11-01  pcav 
+Juergen E. Fischer 	2013-02-03
 
-	* src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-6.4/g.proj.wkt.qgm,
-	src/plugins/grass/modules-common/r.proj.qgm,
-	src/plugins/grass/modules-common/v.proj.qgm: Fixes and cosmetcs fro
-	GRASS toolbox - Thanks Markus Neteler. Fixes #3104 git-svn-id: http://svn.osgeo.org/qgis/trunk@14485
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use CMAKE_*_FLAGS also on unix
 
-2010-11-01  jef 
+Juergen E. Fischer 	2013-02-03
 
-	* src/helpviewer/CMakeLists.txt: add missing paren git-svn-id: http://svn.osgeo.org/qgis/trunk@14484
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more fTools api updates
 
-2010-11-01  mhugent 
+Juergen E. Fischer 	2013-02-03
 
-	* src/analysis/raster/qgsrastercalclexer.ll,
-	src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalcnode.h,
-	src/analysis/raster/qgsrastercalcparser.yy,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/analysis/raster/qgsrastermatrix.h: Apply patch #3178 git-svn-id: http://svn.osgeo.org/qgis/trunk@14483
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging fix
 
-2010-11-01  jef 
+Juergen E. Fischer 	2013-02-03
 
-	* src/core/qgsvectorfilewriter.cpp,
-	src/ui/qgsrastercalcdialogbase.ui: fix #3176 git-svn-id: http://svn.osgeo.org/qgis/trunk@14482
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation fix
 
-2010-11-01  timlinux 
+Larry Shaffer 	2013-02-03
 
-	* src/app/qgisapp.cpp: Updated whatsnew git-svn-id: http://svn.osgeo.org/qgis/trunk@14481
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update stage-installed plugins CMakeLists.txt
 
-2010-11-01  timlinux 
+Merge: dc340de 1095f98
+Victor Olaya 	2013-02-03
 
-	* doc/index.html: Removed some stray colons git-svn-id: http://svn.osgeo.org/qgis/trunk@14480
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-11-01  jef 
+Victor Olaya 	2013-02-03
 
-	* src/core/qgsapplication.cpp, src/core/qgsapplication.h: fix build
-	error on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@14479
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    edited some SAGA/GRASS algorithm description in SEXTANTE
 
-2010-11-01  jef 
+Victor Olaya 	2013-02-03
 
-	* src/app/qgssinglesymboldialog.cpp: fix symbol selection git-svn-id: http://svn.osgeo.org/qgis/trunk@14478
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Minor SEXTANTE changes
 
-2010-11-01  timlinux 
+Victor Olaya 	2013-02-03
 
-	* doc/index.html: Updated whats new for Copiapo git-svn-id: http://svn.osgeo.org/qgis/trunk@14477
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    improvements in SEXTANTE modeler
 
-2010-11-01  mhugent 
+Larry Shaffer 	2013-01-24
 
-	* src/app/qgsmaptoolselectutils.cpp: Reverse alt-key modification to
-	be compatible with the old selection tool git-svn-id: http://svn.osgeo.org/qgis/trunk@14476
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add option to use custom QSettings for QgsCollapsibleGroupBox
+    
+    - Useful for plugins that may want to store collapsed state in their own QSettings file
 
-2010-11-01  kyngchaos 
+Larry Shaffer 	2013-02-02
 
-	* mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in,
-	mac/cmake/3fw.cmake.in, mac/readme.txt,
-	src/helpviewer/CMakeLists.txt: some mac cmake cleanup, update mac
-	folder notes git-svn-id: http://svn.osgeo.org/qgis/trunk@14475
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix build error under clang on Mac
+    
+    - Remove APPLE_CLANG_WARNINGS option
+    - Add warnings via flags instead of definitions
 
-2010-11-01  kyngchaos 
+Juergen E. Fischer 	2013-02-03
 
-	* mac/cmake/3fw.cmake.in: framework bundling placeholder git-svn-id: http://svn.osgeo.org/qgis/trunk@14474
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging update
 
-2010-11-01  borysiasty 
+Juergen E. Fischer 	2013-02-02
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@14473
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more api updates in ftools
 
-2010-11-01  borysiasty 
+Juergen E. Fischer 	2013-02-02
 
-	* python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py: Plugin
-	installer update git-svn-id: http://svn.osgeo.org/qgis/trunk@14472
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings brought up by clang
 
-2010-10-31  borysiasty 
+Juergen E. Fischer 	2013-02-02
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py: Plugin
-	installer update git-svn-id: http://svn.osgeo.org/qgis/trunk@14471
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove usage of deprecated methods within QgsVectorLayer itself
 
-2010-10-31  macho 
+Larry Shaffer 	2013-02-01
 
-	* TRANSLATORS, i18n/qgis_uk.ts: translation update: uk by sergey,
-	changed name in Translators git-svn-id: http://svn.osgeo.org/qgis/trunk@14470
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add CMake option whether to show extra warnings from clang on Apple
+    
+    - Set APPLE_CLANG_WARNINGS:BOOL=FALSE to not show extra warnings (TRUE by default)
 
-2010-10-31  jef 
+Larry Shaffer 	2013-02-01
 
-	* ms-windows/osgeo4w/qgis.bat.tmpl: osgeo4w update git-svn-id: http://svn.osgeo.org/qgis/trunk@14469
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Make sure QtTest gets bundled on Mac, if ENABLE_TESTS is set
+    
+    - Was configured, but wan't being triggered
 
-2010-10-31  jef 
+Etienne Tourigny 	2013-02-01
 
-	* INSTALL, doc/linux.t2t, doc/msvc.t2t, doc/msys.t2t,
-	scripts/scandeps.pl: documentation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14468
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [API] restore QgsMapLayerRegistry::addMapLayer() but keep it deprecated
 
-2010-10-31  kyngchaos 
+Juergen E. Fischer 	2013-02-01
 
-	* INSTALL, doc/osx.t2t: update OS X install git-svn-id: http://svn.osgeo.org/qgis/trunk@14467
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fTools: fix error basic statistics
 
-2010-10-31  jef 
+Alexander Bruy 	2013-02-01
 
-	* python/plugins/fTools/tools/doVisual.py: rollback accidentally
-	commit file of r14465 git-svn-id: http://svn.osgeo.org/qgis/trunk@14466
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    first fix for new vector api in SEXTANTE
 
-2010-10-31  jef 
+Juergen E. Fischer 	2013-02-01
 
-	* python/core/qgsgeometry.sip,
-	python/plugins/fTools/tools/doVisual.py: fix r14462 git-svn-id: http://svn.osgeo.org/qgis/trunk@14465
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    first take on porting ftools to vector iterator api
 
-2010-10-31  mhugent 
+ddehaan 	2013-01-31
 
-	* src/analysis/raster/qgsruggednessfilter.h: Added reference to
-	algorithm description for ruggedness index git-svn-id: http://svn.osgeo.org/qgis/trunk@14464
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Copyright updates; Add headers to feature iterator
 
-2010-10-31  mhugent 
+Juergen E. Fischer 	2013-01-31
 
-	* src/core/qgsapplication.cpp, src/core/qgsapplication.h,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Store svg fill
-	pathes relativ to default svg directory. Fixes bug #3154 git-svn-id: http://svn.osgeo.org/qgis/trunk@14463
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging fix: quantal and raring also use dh_python2
 
-2010-10-31  jef 
+Juergen E. Fischer 	2013-01-31
 
-	* python/core/qgsgeometry.sip, src/core/qgsgeometry.h: add python
-	bindings to QgsGeometry::validateGeometry git-svn-id: http://svn.osgeo.org/qgis/trunk@14462
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    include stack trace in logged python warning messages
 
-2010-10-30  kyngchaos 
+Juergen E. Fischer 	2013-01-31
 
-	* cmake/FindGDAL.cmake, cmake/FindGEOS.cmake, cmake/FindGSL.cmake: 
-	fix detection logic, remove unused setting git-svn-id: http://svn.osgeo.org/qgis/trunk@14460
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-10-30  jef 
+Alexander Bruy 	2013-01-31
 
-	* cmake/FindGSL.cmake: fix GSL detection git-svn-id: http://svn.osgeo.org/qgis/trunk@14459
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    clear cached image for raster layers when applying contrast enhancement
+    from raster toolbar (fix #7069)
 
-2010-10-30  kyngchaos 
+Juergen E. Fischer 	2013-01-31
 
-	* CMakeLists.txt, cmake/FindGDAL.cmake, cmake/FindGEOS.cmake,
-	cmake/FindGSL.cmake, cmake/FindProj.cmake, cmake/FindPyQt.py,
-	cmake/FindPyQt4.cmake, cmake/FindSIP.cmake, cmake/FindSIP.py,
-	cmake/FindSPATIALITE.cmake, cmake/FindSqlite3.cmake,
-	mac/CMakeLists.txt, mac/cmake/0qgis.cmake.in,
-	mac/cmake/1qt.cmake.in, mac/cmake/2lib.cmake.in,
-	src/app/CMakeLists.txt, src/helpviewer/CMakeLists.txt,
-	src/mac/Contents/CMakeLists.txt, src/mac/Contents/Info.plist.in: Mac
-	cmake update: cleaner framework detection; optional bundle Qt/PyQt
-	and libraries, and fixup paths git-svn-id: http://svn.osgeo.org/qgis/trunk@14458
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging update
 
-2010-10-30  mhugent 
+Merge: a396613 3b29fad
+Nathan Woodrow 	2013-01-31
 
-	* src/plugins/offline_editing/offline_editing.cpp: Patch from
-	Mathias Walker: improvement of geometry detection in offline plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14457
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #416 from szekerest/master
+    
+    Update MS SQL driver to new vector API
 
-2010-10-30  wonder 
+Alexander Bruy 	2013-01-31
 
-	* src/app/qgspluginmanager.cpp: Plugin manager: set focus to the
-	filter edit box so that it is possible to search immediately after
-	opening the dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14456
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update russian python console help translation
 
-2010-10-30  jef 
+Merge: 859854f c728ea4
+Werner Macho 	2013-01-30
 
-	* cmake/FindGSL.cmake, cmake/FindQWT.cmake,
-	src/core/qgsvectorlayer.h: fix lenny build git-svn-id: http://svn.osgeo.org/qgis/trunk@14455
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #415 from gioman/master
+    
+    Some translations for the pt_PT GUI.
 
-2010-10-30  wonder 
+Larry Shaffer 	2013-01-30
 
-	* src/core/qgsvectorlayer.cpp,
-	src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp: Fixed #3006 and
-	added a convenience spin box for setting symbol levels (constrained
-	to 0-999) git-svn-id: http://svn.osgeo.org/qgis/trunk@14454
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update project file opening precedence order at app launch
+    
+    - Fix typo so default template on new project works
+    - Project open precedence order is (highest first):
+    -  1) specified on command line
+    -  2) specified or most recent via Options gui
+    -  3) new project from template
+    -  4) new blank project
+    - Keep new project template from loading in app constructor (in case already project via command line)
+    - Keep new project template from loading if previous auto-open project crashed
+    - Add status bar messages about loading project during addProject()
 
-2010-10-30  wonder 
+Giovanni Manghi 	2013-01-31
 
-	* python/plugins/osm/OsmAddRelationDlg.py,
-	python/plugins/osm/OsmDownloadDlg.py,
-	python/plugins/osm/OsmLoadDlg.py, python/plugins/osm/OsmSaveDlg.py,
-	python/plugins/osm/OsmUploadDlg.py: Fix occasionally appearing bug
-	in OSM plugin (#3150, #3076, #3025) git-svn-id: http://svn.osgeo.org/qgis/trunk@14453
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Some translations
 
-2010-10-30  wonder 
+Juergen E. Fischer 	2013-01-31
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/gui/qgisinterface.h: Added new project and project read signals
-	to the qgis interface (#3160).  Contributed by Alexander Bruy -
-	thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14452
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    OGR style support only with GDAL >=1.7
 
-2010-10-29  brushtyler 
+Juergen E. Fischer 	2013-01-30
 
-	* python/core/qgsvectorlayer.sip, src/app/qgisapp.cpp,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h: applied
-	patch to make a vector layer read-only, to fix #3157 git-svn-id: http://svn.osgeo.org/qgis/trunk@14451
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix QgsSqlAnywhereProvider::attributeIndexes()
 
-2010-10-29  brushtyler 
+Juergen E. Fischer 	2013-01-30
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doMerge.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py: applied the patch
-	suggested in ticket #3151, fix in translate to use the
-	GdalTools_utils to get the crs, managed invalid extent in merge tool git-svn-id: http://svn.osgeo.org/qgis/trunk@14450
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging: reenable sqlanywhere provider
 
-2010-10-29  macho 
+Juergen E. Fischer 	2013-01-30
 
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsDelimitedTextPluginGui-de_DE: translation
-	update: improvements and correction on delimited text plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@14449
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix attribute mapping in vector layer import
 
-2010-10-29  jef 
+ddehaan 	2013-01-29
 
-	* src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: fix #1022 git-svn-id: http://svn.osgeo.org/qgis/trunk@14448
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update SQLAnywhere data provider to the new API.
 
-2010-10-29  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: layer removal action
-	depends on selected layers and not the current layer git-svn-id: http://svn.osgeo.org/qgis/trunk@14447
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-29  mhugent 
-
-	* src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp,
-	src/ui/qgslabelingguibase.ui: Fix for bug #3143, apply double values
-	for label sizes git-svn-id: http://svn.osgeo.org/qgis/trunk@14446
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-29  jef 
-
-	* cmake/Bison.cmake, cmake/Flex.cmake,
-	src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalcnode.h,
-	src/analysis/raster/qgsrastercalcparser.yy,
-	src/analysis/raster/qgsrastercalculator.cpp,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/app/qgsrastercalcdialog.cpp: fix nightly build git-svn-id: http://svn.osgeo.org/qgis/trunk@14445
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-30
 
-2010-10-28  mhugent 
-
-	* src/core/qgsvectorlayer.cpp: Fix bug #3114 git-svn-id: http://svn.osgeo.org/qgis/trunk@14444
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-28  mhugent 
+    fix attribute table for new vector api
 
-	* src/analysis/raster/qgsrastercalcparser.yy: Also add rastercalc
-	bison file to svn git-svn-id: http://svn.osgeo.org/qgis/trunk@14443
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-28  mhugent 
+szekerest 	2013-01-30
 
-	* cmake/Bison.cmake, cmake/Flex.cmake, src/analysis/CMakeLists.txt,
-	src/analysis/raster/qgsrastercalclexer.ll,
-	src/analysis/raster/qgsrastercalcnode.cpp,
-	src/analysis/raster/qgsrastercalcnode.h,
-	src/analysis/raster/qgsrastercalculator.cpp,
-	src/analysis/raster/qgsrastercalculator.h,
-	src/analysis/raster/qgsrastermatrix.cpp,
-	src/analysis/raster/qgsrastermatrix.h, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsrastercalcdialog.cpp, src/app/qgsrastercalcdialog.h,
-	src/ui/qgsrastercalcdialogbase.ui: [FEATURE]: Add rastercalculator git-svn-id: http://svn.osgeo.org/qgis/trunk@14442
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-28  jef 
+    Rework mssql driver to support the new iterator model
 
-	* cmake/FindQWT.cmake, doc/msvc.t2t: fix r14440 git-svn-id: http://svn.osgeo.org/qgis/trunk@14441
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-27  jef 
-
-	* INSTALL, cmake/FindFcgi.cmake, cmake/FindGDAL.cmake,
-	cmake/FindGEOS.cmake, cmake/FindGRASS.cmake, cmake/FindGSL.cmake,
-	cmake/FindIconv.cmake, cmake/FindQWT.cmake, doc/INSTALL.t2t,
-	doc/authors.t2t, doc/index.dox, doc/linux.t2t, doc/msvc.t2t,
-	doc/msys.t2t, doc/osx.t2t, doc/overview.t2t,
-	src/core/CMakeLists.txt: update install/build documentation & cmake
-	updates: - split install document into multiple files - reorder chapters - update msvc part (shortend add reference to OSGeo4W dependencies) - update CMake files to look in $ENV{LIB} and $ENV{INCLUDE} git-svn-id: http://svn.osgeo.org/qgis/trunk@14440
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-30
 
-2010-10-27  jef 
+    debian packaging fix (quantal versions were actually unused before a4fa7535)
 
-	* src/app/qgsoptions.cpp, src/app/qgsoptions.h,
-	src/core/qgscoordinatetransform.cpp,
-	src/core/qgscoordinatetransform.h, src/ui/qgsoptionsbase.ui: partly
-	revert r14399 (all except srs updates): - proj.4 user paths mask standard directory - gsb file warning doesn't make sense for optional grids.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14439
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-30
 
-2010-10-27  macho 
+    Fix ruler layout
 
-	* TRANSLATORS, i18n/qgis_es.ts,
-	resources/context_help/QgsComposer-es_ES,
-	resources/context_help/QgsCopyrightLabelPluginGui-es_ES,
-	resources/context_help/QgsCustomProjectionDialog-es_ES,
-	resources/context_help/QgsDelimitedTextPluginGui-es_ES: translation
-	update: es by Carlos and new context help by Edwin Amado git-svn-id: http://svn.osgeo.org/qgis/trunk@14438
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-28
 
-2010-10-27  mhugent 
+    [FEATURE] Add option to auto-open 'New, Most recent or Specific' project on app launch
+    
+    - Add error trapping to catch bad projects that crash app, then notify user and avoid reopening
 
-	* src/app/gps/qgsgpsmarker.cpp: Catch crs transformation exceptions
-	in gpsmarker git-svn-id: http://svn.osgeo.org/qgis/trunk@14437
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-29
 
-2010-10-26  jef 
+    Switch QgsMessageBar subject/message from QLabel to QTextEdit
+    
+    - Fix issue with heightForWidth where long lines in QLabel with word wrap cause excessive message bar height
+    - Set scroll area fixed height to 1.5 font-based line size, creating a single line scroll box for wrapped messages
+    - Can now select and copy message subject and text
+    - HTML (QTextEdit subset) now supported for message
+    - Clean up Close button style
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/gui/qgisgui.cpp, src/gui/qgisgui.h,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgscolorrampcombobox.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h,
-	tests/src/core/testqgsvectorlayer.cpp: automatic indentation update
-	(r14312-r14435) git-svn-id: http://svn.osgeo.org/qgis/trunk@14436
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-26  esseffe 
-
-	* src/app/qgsspatialitesourceselect.cpp,
-	src/app/qgsspatialitesourceselect.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h: a) applied the patch suggested in ticket #3139 b) fixed the SourceSelect dialog so to avoid    showing RasterLite-1 related tables git-svn-id: http://svn.osgeo.org/qgis/trunk@14435
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-25  wonder 
-
-	* src/python/qgspythonutilsimpl.cpp: Make calls to python api safer
-	by ensuring we have global interpreter lock git-svn-id: http://svn.osgeo.org/qgis/trunk@14434
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-25  jef 
-
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/qgsquerybuilder.cpp, src/core/qgsvectorlayer.cpp: fix #3153 git-svn-id: http://svn.osgeo.org/qgis/trunk@14433
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-25  mhugent 
-
-	* src/app/composer/qgscomposertablewidget.cpp: Unblocking of signals
-	already done in updateGuiElements() method git-svn-id: http://svn.osgeo.org/qgis/trunk@14432
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-23  jef 
-
-	* ms-windows/osgeo4w/creatensis.pl: fix creatensis.pl git-svn-id: http://svn.osgeo.org/qgis/trunk@14431
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-23  mhugent 
-
-	* python/core/qgsmaptopixel.sip, src/core/qgsmaptopixel.cpp,
-	src/core/qgsmaptopixel.h, src/core/qgspallabeling.cpp,
-	src/core/qgspallabeling.h: Add method to convert double precision
-	device coordinates to map coords (important for print composer).
-	Change pallabeling to use FontMetricsF and toMapCoordinatesF. Fixes
-	bug #3065 git-svn-id: http://svn.osgeo.org/qgis/trunk@14430
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-23  mhugent 
+    debian packaging update: ubuntu raring
 
-	*
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.
-	cpp: Bugfix for format list and improvement for output file
-	validation in raster terrain dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14429
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-22  wonder 
+    german translation update
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Correct arrow size
-	for print (#3144) git-svn-id: http://svn.osgeo.org/qgis/trunk@14428
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-22  wonder 
+    oracle provider: fix support for geometryless tables (fixes #7023)
 
-	* src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: Fix a crash
-	(#3147) git-svn-id: http://svn.osgeo.org/qgis/trunk@14427
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-29
 
-2010-10-22  kyngchaos 
+    (notes and micro-cleanup)
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync with r14416, r14421 git-svn-id: http://svn.osgeo.org/qgis/trunk@14426
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-29
 
-2010-10-21  timlinux 
+    upgraded to collapsible groupboxes
 
-	* src/app/CMakeLists.txt, src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/plugins/georeferencer/CMakeLists.txt,
-	src/ui/qgsrasterlayerpropertiesbase.ui: Fix crash in raster props
-	when histogram tab is last used and props dialog is opened.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14425
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-29
 
-2010-10-20  wonder 
+    fix for composer map item's background when non-opaque
 
-	* src/app/qgslabelinggui.cpp, src/app/qgslabelinggui.h,
-	src/core/pal/feature.cpp, src/core/pal/feature.h,
-	src/core/pal/labelposition.cpp, src/core/pal/labelposition.h,
-	src/core/pal/layer.cpp, src/core/pal/layer.h,
-	src/core/qgspallabeling.cpp, src/core/qgspallabeling.h,
-	src/ui/qgslabelingguibase.ui: [FEATURE] Data defined label position
-	in new labeling - from Marco Hugentobler.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14423
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a00e413 bb97787
+Marco Hugentobler 	2013-01-29
 
-2010-10-20  wonder 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/ui/qgssymbolv2selectordialogbase.ui: Added "style manager..."
-	button to symbol selector so that users will find the style manager
-	more easily.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14422
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 81dacc7 9f9ce32
+Marco Hugentobler 	2013-01-29
 
-2010-10-20  wonder 
+    [FEATURE]: possibility to export vector symbology (using ogr feature style)
 
-	* src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgscolorrampcombobox.cpp,
-	src/gui/symbology-ng/qgscolorrampcombobox.h,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.h,
-	src/ui/qgscategorizedsymbolrendererv2widget.ui,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui: [FEATURE] Allow
-	creation of color ramps in color ramp combo box.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14421
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-20  jef 
+    fix sip error
 
-	* src/app/legend/qgslegend.cpp: don't allow dropping layers into
-	legend classes git-svn-id: http://svn.osgeo.org/qgis/trunk@14420
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-29
 
-2010-10-20  jef 
+    Implement drawing of ruler markers
 
-	* : apply #3136 git-svn-id: http://svn.osgeo.org/qgis/trunk@14418
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-01-29
 
-2010-10-19  macho 
+    translation update: et_EE by Veiko
 
-	* i18n/qgis_es.ts,
-	resources/context_help/QgsAttributeTableDialog-es_ES: translation
-	updates: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@14416
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-19  jef 
+    register QgsMessageLog::MessageLevel
 
-	* src/app/qgsattributedialog.cpp, src/app/qgsidentifyresults.cpp: 
-	fix #2950 git-svn-id: http://svn.osgeo.org/qgis/trunk@14414
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-28
 
-2010-10-19  macho 
+    begins to work
 
-	* i18n/qgis_ja.ts: translation update: ja by yoichi kayama git-svn-id: http://svn.osgeo.org/qgis/trunk@14413
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-28
 
-2010-10-19  jef 
+    UI enable/disable works
 
-	* src/core/qgsmaplayer.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/raster/qgsrasterlayer.cpp: fix #3134 git-svn-id: http://svn.osgeo.org/qgis/trunk@14412
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-29
 
-2010-10-19  jef 
+    update calls to new api
 
-	* i18n/qgis_de.ts, src/core/gps/qgsgpsdconnection.h: german
-	translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@14411
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-29
 
-2010-10-19  kyngchaos 
+    [feature] added draw background checkbox in composer items
+    (this allow to workaround the non-opaque background bug with atlas and is more consistent with the frame settings) )
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: remove files not
-	directly processed by Xcode to make updating project simpler git-svn-id: http://svn.osgeo.org/qgis/trunk@14410
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-26
 
-2010-10-18  macho 
+    [FEATURE] Add style options for legend layer/groups, and live refresh of all legend style options
+    
+    - Based of off work from Stefan Ziegler (pull request #331)
+    - Options inherited by embedded groups (which are still always italic)
+    - Original layer name now saved to project file (instead of adjusted display name)
+    - Fix bug where setting capitalization, then saving/reopening would permanently set capitalization
+    - [API] Add originalName() to QgsMapLayer to access original (pre-adjusted name)
+    - [API] Add setupFont() method to legend group items
+    - [API] Add updateLegendItemStyles() and updateLegendItemSymbologies() to QgsLegend to allow style option changes to become active without app restart
 
-	* TRANSLATORS: updated list of Translators git-svn-id: http://svn.osgeo.org/qgis/trunk@14409
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 8c89c2a c279ec2
+Giuseppe Sucameli 	2013-01-28
 
-2010-10-18  jef 
+    Merge pull request #394 from etiennesky/gdaltools1
+    
+    GdalTools - use raster format save option and pyramids dialogs
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/app/legend/qgslegendlayer.h: don't show legend checkbox for
-	geometryless layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14408
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-28
 
-2010-10-18  timlinux 
+    fix layerModified signal mapping
 
-	* images/images.qrc: Fix for missing table icons for non spatial
-	layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14407
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-28
 
-2010-10-18  wonder 
+    implement currentLayer() and setCurrentLayer() in QgsLegendInterface to set/get current layer
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Remember
-	the classification mode in graduated symbol renderer (v2) git-svn-id: http://svn.osgeo.org/qgis/trunk@14406
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-28
 
-2010-10-18  wonder 
+    allows for plugins to insert actions for layers in TOC, with QgsLegendInterface::addLegendLayerAction()
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.h: Applied part of
-	#2832 (show rules in legend).  git-svn-id: http://svn.osgeo.org/qgis/trunk@14404
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-28
 
-2010-10-18  jef 
+    Remove invalid relative path to images resource file
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14403
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 958cd2a 4cd271b
+Nathan Woodrow 	2013-01-28
 
-2010-10-18  wonder 
+    Merge pull request #403 from matthias-kuhn/expression-build-dialog-save-window-geometry
+    
+    Save geometry of expression build dialog on close
 
-	* python/core/symbology-ng-core.sip: Added missing python bindings
-	for graduated symbol renderer v2 git-svn-id: http://svn.osgeo.org/qgis/trunk@14402
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 6c931f3 fb63167
+Nathan Woodrow 	2013-01-28
 
-2010-10-18  cfarmer 
+    Merge pull request #407 from matthias-kuhn/expression-builder-margin
+    
+    Fix for #6165 - Overlapping widgets in expression builder dialog
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: [FEATURE]
-	adds 3 new classification algorithms, including natural breaks
-	(jenks), standard deviations, and a 'pretty' algorithm for
-	generating 'human readable' class breaks git-svn-id: http://svn.osgeo.org/qgis/trunk@14401
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-01-28
 
-2010-10-18  timlinux 
+    Fix for #6165 - Overlapping widgets in expression builder dialog
+    Reset the top margin of widgets to the default value
 
-	* tests/src/core/testqgsvectorlayer.cpp: Make the unit test more
-	explicitly test result size and use a proper attribute list git-svn-id: http://svn.osgeo.org/qgis/trunk@14400
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-28
 
-2010-10-18  jef 
+    debian packaging update (fixes #7060)
 
-	* src/app/qgsoptions.cpp, src/app/qgsoptions.h,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatetransform.cpp,
-	src/core/qgscoordinatetransform.h, src/ui/qgsoptionsbase.ui: 
-	[FEATURE] allow user specific PROJ.4 search paths and update srs.db
-	to include grid reference (fixes #3099) git-svn-id: http://svn.osgeo.org/qgis/trunk@14399
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-28
 
-2010-10-18  wonder 
+    Add composer rulers to composer graphics view
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: Applied
-	#2963 (fix crash with quantiles) from Jeremy Palmer. Thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14398
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-28
 
-2010-10-18  macho 
+    Add class QgsComposerRuler
 
-	* i18n/qgis_sl_SI.ts: translation update: proudly present - new
-	language slovenian by Joze Detecnik git-svn-id: http://svn.osgeo.org/qgis/trunk@14397
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-28
 
-2010-10-18  timlinux 
+    fix warnings, add copyright headers, cosmetics
 
-	* tests/src/core/CMakeLists.txt,
-	tests/src/core/testqgsvectorlayer.cpp: Beginnings of unit test for
-	vector layer git-svn-id: http://svn.osgeo.org/qgis/trunk@14396
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-27
 
-2010-10-18  jef 
+    osgeo4w: packaging updates
 
-	* src/app/attributetable/qgsattributetablemodel.cpp: fix #3132 git-svn-id: http://svn.osgeo.org/qgis/trunk@14395
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-27
 
-2010-10-18  jef 
+    minor edits to SEXTANTE algorithms and scripts
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/legend/qgslegendgroup.cpp, src/app/legend/qgslegendgroup.h,
-	src/app/legend/qgslegenditem.h, src/app/legend/qgslegendlayer.cpp,
-	src/app/legend/qgslegendlayer.h,
-	src/app/legend/qgslegendpropertygroup.cpp,
-	src/app/legend/qgslegendpropertygroup.h,
-	src/app/legend/qgslegendpropertyitem.cpp,
-	src/app/legend/qgslegendpropertyitem.h,
-	src/app/legend/qgslegendsymbologygroup.cpp,
-	src/app/legend/qgslegendsymbologygroup.h,
-	src/app/legend/qgslegendsymbologyitem.cpp,
-	src/app/legend/qgslegendsymbologyitem.h,
-	src/app/legend/qgslegendvectorsymbologyitem.h,
-	src/core/composer/qgscomposition.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsproject.cpp, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h, src/gui/qgslegendinterface.h,
-	src/gui/qgsprojectbadlayerguihandler.cpp,
-	src/mapserver/CMakeLists.txt, src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsconfigparser.cpp,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgsmapserverlogger.cpp,
-	src/mapserver/qgsmapserverlogger.h,
-	src/mapserver/qgsmslayercache.cpp,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h,
-	src/mapserver/qgsremotedatasourcebuilder.cpp,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/mapserver/qgssentdatasourcebuilder.cpp,
-	src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgswmsserver.cpp: [FEATURE] add support for nested
-	layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14394
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-27
 
-2010-10-18  jef 
+    Update doc/osx.t2t
 
-	* src/app/qgisapp.cpp, src/app/qgsquerybuilder.cpp,
-	src/app/qgsvectorlayerproperties.cpp: disable query change while
-	editing git-svn-id: http://svn.osgeo.org/qgis/trunk@14393
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 247c2db 5b9b03f
+Paolo Cavallini 	2013-01-27
 
-2010-10-18  jef 
+    Merge pull request #405 from matthias-kuhn/piediagram-test-fix
+    
+    Replace control image for piediagram with proper one
 
-	* src/app/qgssinglesymboldialog.cpp,
-	src/app/qgssinglesymboldialog.h,
-	src/ui/qgssinglesymboldialogbase.ui: change list to view in single
-	symbol dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14392
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-27
 
-2010-10-18  jef 
+    qwt compile error under OSX - note for Larry
 
-	* src/core/qgsvectordataprovider.cpp, src/core/qgsvectorlayer.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: improve support for
-	geometry-less layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14391
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-01-27
 
-2010-10-17  timlinux 
+    Replace control image for piediagram with proper one
 
-	* src/core/qgsvectorlayer.cpp: Fix crash and corruption of project
-	file when saving project with non spatial layers. Fix issue
-	preventing projects with non-spatial layers being loaded.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14390
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-27
 
-2010-10-17  timlinux 
+    Update osx install - update old nokia download path
 
-	* : Copiapo it the new in thing...  git-svn-id: http://svn.osgeo.org/qgis/trunk@14389
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-27
 
-2010-10-17  jef 
+    Added compiled SEXTANTE ui files
 
-	* debian/changelog, debian/control, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick, debian/control.sid,
-	debian/control.squeeze: debian packaging: trim dependencies git-svn-id: http://svn.osgeo.org/qgis/trunk@14388
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-27
 
-2010-10-17  timlinux 
+    edited GRASS and SAGA algorithm descriptions
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h: Fixed bug where histogram
-	disappears when defocussing then focusing histogram tab git-svn-id: http://svn.osgeo.org/qgis/trunk@14387
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 20e4ec5 a9a289e
+Victor Olaya 	2013-01-27
 
-2010-10-16  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* src/app/qgsquerybuilder.cpp, src/app/qgsquerybuilder.h: fix #3124 git-svn-id: http://svn.osgeo.org/qgis/trunk@14386
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-27
 
-2010-10-16  kyngchaos 
+    Update doc/osx.t2t
+    
+    Added note about how to get command line tools.
 
-	* cmake/FindGDAL.cmake, cmake/FindGRASS.cmake, cmake/FindGSL.cmake,
-	cmake/FindPostgres.cmake, cmake/FindProj.cmake,
-	cmake/FindSPATIALITE.cmake, cmake/FindSqlite3.cmake: find more Mac
-	frameworks; extra default search paths for postgres git-svn-id: http://svn.osgeo.org/qgis/trunk@14385
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-27
 
-2010-10-16  kyngchaos 
+    OSM provider ported to new API
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: misc updates, fixup mapserver
-	build git-svn-id: http://svn.osgeo.org/qgis/trunk@14384
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-26
 
-2010-10-16  pcav 
+    edited GRASS/SEXTANTE algorithm descriptions
 
-	* src/plugins/grass/modules-6.4/default.qgc: Polished GRASS modules
-	tree. Thanks Markus Neteler. Applies #3104 git-svn-id: http://svn.osgeo.org/qgis/trunk@14383
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-26
 
-2010-10-16  pcav 
+    minor sextante fixes
 
-	* DONORS, i18n/qgis_it.ts: Updated DONORS and added some IT
-	translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14382
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-26
 
-2010-10-15  timlinux 
+    Postgres - debug mode: do not slow down fetching of features unless necessary
+    
+    (the debug routine was consuming ~50% of rendering time)
 
-	* src/app/qgsrasterlayerproperties.cpp: Show actual pixel values on
-	x axis of raster histogram git-svn-id: http://svn.osgeo.org/qgis/trunk@14381
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-26
 
-2010-10-14  jef 
+    fix windows build
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: ask for postgres
-	credentials on any connection error (not only missing password) git-svn-id: http://svn.osgeo.org/qgis/trunk@14380
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivier 	2013-01-20
 
-2010-10-14  jef 
+    Added layerIsExpanded() to QgsLegendInterface
 
-	* src/app/postgres/qgspgnewconnection.cpp: use username and password
-	for pg connection test, even if they are not going to be saved git-svn-id: http://svn.osgeo.org/qgis/trunk@14379
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-26
 
-2010-10-13  jef 
+    german translation update
 
-	* src/core/gps/qgsgpsdconnection.cpp: fix gpsd device selection git-svn-id: http://svn.osgeo.org/qgis/trunk@14378
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-26
 
-2010-10-13  jef 
+    follow up 994dc1cc216: also change level in QgsMessageLogViewer
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/gui/qgsmapcanvas.cpp: fix #3109 git-svn-id: http://svn.osgeo.org/qgis/trunk@14377
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-26
 
-2010-10-13  jef 
+    QgsVectorLayer: deprecate old API: select(), nextFeature(), featureAtId()
 
-	* src/app/legend/qgslegendlayer.cpp: fix #3110 git-svn-id: http://svn.osgeo.org/qgis/trunk@14376
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 985468e 994dc1c
+Martin Dobias 	2013-01-26
 
-2010-10-13  timlinux 
+    Merge remote-tracking branch 'origin/master' into new_vector_api
 
-	* src/core/qgscoordinatereferencesystem.h: Fixed some typos in docs git-svn-id: http://svn.osgeo.org/qgis/trunk@14375
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-26
 
-2010-10-13  timlinux 
+    - [API] introduce QgsMessageLog::MessageLevel and change logMessage() level
+      parameter to that type
+    - change default level to WARNING
+    - change startup messages to INFO
+    - don't unhide the warning button for INFO messages
+    - fix warnings produced by python code
 
-	* src/core/qgsmaplayer.h: Fix typo in docs git-svn-id: http://svn.osgeo.org/qgis/trunk@14374
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-26
 
-2010-10-13  timlinux 
+    Add test for format expression function
 
-	* src/core/qgsmaprenderer.h: Small fix to doxygen docs for
-	maprenderer class git-svn-id: http://svn.osgeo.org/qgis/trunk@14373
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-25
 
-2010-10-13  timlinux 
+    Add empty QUndoView to QgsUndoWidget for initial show
+    
+    - Shows disabled view instead of blank dock area (same as creating new project after closing project)
 
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: Added option to generate thumbnail
-	using qimage rather than qpixmap git-svn-id: http://svn.osgeo.org/qgis/trunk@14372
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-25
 
-2010-10-12  jef 
+    cleanup doIntersectLines.py and fix #7021
 
-	* src/mapserver/CMakeLists.txt: fix cmake warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14370
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-01-25
 
-2010-10-11  mhugent 
+    Save geometry of expression build dialog on close
 
-	* src/app/qgsfieldcalculator.cpp: Field calculator: insert NULL
-	feature value in case of calculation error (instead of stopping and
-	reverting calculation for all features) git-svn-id: http://svn.osgeo.org/qgis/trunk@14369
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-25
 
-2010-10-11  mhugent 
+    append resolution and transparency arguments also to tile request (fixes #3981)
 
-	* src/core/composer/qgscomposerattributetable.cpp: Fix side effect
-	of last commit git-svn-id: http://svn.osgeo.org/qgis/trunk@14368
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-25
 
-2010-10-11  mhugent 
+    leaner imitation of .arg
 
-	* src/app/composer/qgsattributeselectiondialog.cpp,
-	src/app/composer/qgsattributeselectiondialog.h,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgscomposerattributetable.h,
-	src/ui/qgsattributeselectiondialogbase.ui: [FEATURE]: Sorting for
-	composer attribute table (several columns and ascending /
-	descending) git-svn-id: http://svn.osgeo.org/qgis/trunk@14367
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-01-25
 
-2010-10-11  macho 
+    WCS max extent verification fix for servers without overvies
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14365
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-24
 
-2010-10-11  jef 
+    Fix background issue for Gnome desktop
+    
+    - Revert de437ab
 
-	* src/ui/symbollayer/widget_svgfill.ui: fix build error git-svn-id: http://svn.osgeo.org/qgis/trunk@14364
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-23
 
-2010-10-11  pcav 
+    Add Qt styles flags to QgsAppStyleSheet and update styled group boxes
 
-	* src/plugins/grass/modules-6.4/default.qgc,
-	src/plugins/grass/modules-6.4/g.proj.wkt.qgm: New GRASS command.
-	Applied patch from #3104 by Markus Neteler, with modifications git-svn-id: http://svn.osgeo.org/qgis/trunk@14363
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-01-25
 
-2010-10-10  wonder 
+    more robust raster color map conversion from 1.8 project and style file, fixes #7023
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h: symbology-ng:
-	Improved loading speed of the symbol properties dialog.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14362
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4f3e89a 2a54248
+Victor Olaya 	2013-01-24
 
-2010-10-08  mhugent 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* python/core/qgscomposeritem.sip,
-	src/app/composer/qgsitempositiondialog.cpp,
-	src/app/composer/qgsitempositiondialog.h,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/ui/qgsitempositiondialogbase.ui: [FEATURE]: add capability to
-	show and manipulate composer item with/ height in item position
-	dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14356
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-24
 
-2010-10-07  alexbruy 
+    added extra import parameters for vector layers in GRASS/SEXTANTE interface
+    minor fix to create a new instance when a model is edited
 
-	* src/mapserver/qgis_map_serv.cpp: fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@14354
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-24
 
-2010-10-07  mhugent 
+    edited GRASS/SEXTANTE descriptions
 
-	* src/core/pal/layer.cpp, src/core/pal/pal.cpp: Fix for dateline
-	labeling problems git-svn-id: http://svn.osgeo.org/qgis/trunk@14352
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-24
 
-2010-10-07  kyngchaos 
+    use 'geom' as default name for geometry columns in browser data items (implements #7042)
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: sync with r14331, r14335,
-	r14325 git-svn-id: http://svn.osgeo.org/qgis/trunk@14351
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-24
 
-2010-10-06  jef 
+    Consider WMS opacity also for labels and in the GetPrint request
 
-	* ms-windows/QGIS-Installer.nsi: fix #3082 git-svn-id: http://svn.osgeo.org/qgis/trunk@14350
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-24
 
-2010-10-06  jef 
+    Add string format() function to expression
 
-	* debian/control: revert debian change from 14348.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14349
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-24
 
-2010-10-06  jef 
+    log python warnings and enabled deprecation warnings
 
-	* debian/control, i18n/qgis_de.ts,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetabledialog.h: german translation
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@14348
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5f304b3 0ccff60
+Martin Dobias 	2013-01-24
 
-2010-10-06  jef 
+    Merge remote-tracking branch 'jef/oraclespatial-nva' into new_vector_api
+    
+    Conflicts:
+doc/TRANSLATORS           
+i18n/qgis_de.ts           
+src/app/qgisapp.cpp           
+src/core/qgis.cpp           
+src/core/qgsvectorlayerimport.cpp           
+src/providers/oracle/CMakeLists.txt           
+src/providers/oracle/qgsoracleprovider.cpp           
+src/providers/oracle/qgsoracleprovider.h           
 
-	* src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/offline_editing/offline_editing.h,
-	src/plugins/offline_editing/offline_editing_plugin.cpp,
-	src/plugins/offline_editing/offline_editing_plugin.h,
-	src/plugins/offline_editing/offline_editing_plugin_gui.cpp,
-	src/plugins/offline_editing/offline_editing_plugin_gui.h,
-	src/plugins/offline_editing/offline_editing_progress_dialog.cpp,
-	src/plugins/offline_editing/offline_editing_progress_dialog.h: fix
-	more warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14347
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: dda51c6 5f70a68
+Martin Dobias 	2013-01-23
 
-2010-10-06  jef 
+    Merge remote-tracking branch 'origin/master' into new_vector_api
+    
+    Conflicts:
+python/core/qgsvectordataprovider.sip           
+src/app/legend/qgslegendlayer.cpp           
+src/app/qgisapp.cpp           
+src/app/qgsmergeattributesdialog.cpp           
+src/core/qgsvectordataprovider.cpp           
+src/core/qgsvectordataprovider.h           
+src/core/qgsvectorlayer.cpp           
+src/gui/qgssearchquerybuilder.cpp           
+src/providers/postgres/qgspostgresprovider.cpp           
+src/providers/wfs/CMakeLists.txt           
 
-	* src/gui/qgisgui.cpp, src/gui/qgisgui.h: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14346
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-24
 
-2010-10-06  jef 
+    Fix error in test for issue 7023
 
-	* src/mapserver/CMakeLists.txt, src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgsmslayerbuilder.cpp,
-	src/mapserver/qgssldparser.cpp,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgswmsserver.cpp: fix qgis mapserver on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@14345
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-23
 
-2010-10-05  jef 
+    port oracle provider to new_vector_api
+    + progress dialog in progress dialog
+    + fix for feature form from attribute table
 
-	* src/core/qgsattributeaction.cpp: change attribute action notation
-	from [%attr%]/%attr% back to [%attr]/%attr git-svn-id: http://svn.osgeo.org/qgis/trunk@14341
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: de437ab b1bfb9a
+Tim Sutton 	2013-01-23
 
-2010-10-05  jef 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/core/gps/qgsgpsdetector.cpp: fix assertion in gps detector git-svn-id: http://svn.osgeo.org/qgis/trunk@14340
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-23
 
-2010-10-05  jef 
+    Set options list style to to white background
 
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/core/gps/qextserialport/qextserialenumerator.cpp: fix com port
-	detection on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@14339
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 53197ad 73b3d9c
+Larry Shaffer 	2013-01-22
 
-2010-10-05  jef 
+    Merge pull request #389 from slarosa/pyqgis-console
+    
+    Update translation for Python Console
 
-	* debian/changelog, debian/qgis.install: include offline editing
-	plugin in debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@14338
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-14
 
-2010-10-05  jef 
+    more oracle provider improvements:
+    - enable warnings and more error handling in qocispatial
+    - read ordinates in one go (OCICollGetElemArray/OCINumberToRealArray not working yet)
+    - set prefetch count
+    - fix support for int keys (numbers with precision 0)
+    - interpret oracle crs without auth_name as EPSG
 
-	* src/plugins/offline_editing/CMakeLists.txt,
-	src/plugins/offline_editing/offline_editing.h: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@14337
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-14
 
-2010-10-05  jef 
+    oracle provider improvements:
+    - improve srs lookup
+    - insert crs to oracle table on import, if not existent (requires INSERT privilege on MDSYS.SDO_COORD_REF_SYSTEM)
+    - move table lookup into thread
+    - use QgsMessageOutput for import errors (also in postgres and spatialite)
+    - german translation update
 
-	* src/mapserver/qgsfilter.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14336
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-12
 
-2010-10-05  mhugent 
+    oracle provider: accept number(0) as key
 
-	* src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/plugins/CMakeLists.txt,
-	src/plugins/offline_editing/CMakeLists.txt,
-	src/plugins/offline_editing/offline_editing.cpp,
-	src/plugins/offline_editing/offline_editing.h,
-	src/plugins/offline_editing/offline_editing_plugin.cpp,
-	src/plugins/offline_editing/offline_editing_plugin.h,
-	src/plugins/offline_editing/offline_editing_plugin.qrc,
-	src/plugins/offline_editing/offline_editing_plugin_gui.cpp,
-	src/plugins/offline_editing/offline_editing_plugin_gui.h,
-	src/plugins/offline_editing/offline_editing_plugin_guibase.ui,
-	src/plugins/offline_editing/offline_editing_progress_dialog.cpp,
-	src/plugins/offline_editing/offline_editing_progress_dialog.h,
-	src/plugins/offline_editing/offline_editing_progress_dialog_base.ui: 
-	[FEATURE]: offline editing plugin from Mathias Walker git-svn-id: http://svn.osgeo.org/qgis/trunk@14335
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-10-05  jef 
+    oracle provider: fix connection settings
 
-	* src/core/gps/qextserialport/qextserialenumerator.h: fix qextserial
-	in mingw? git-svn-id: http://svn.osgeo.org/qgis/trunk@14333
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-10-04  jef 
+    [FEATURE] add oracle provider
 
-	* src/gui/qgsprojectionselector.cpp,
-	src/ui/qgsprojectionselectorbase.ui: fix #3080 git-svn-id: http://svn.osgeo.org/qgis/trunk@14332
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-04  jef 
-
-	* src/app/gps/qgsgpsinformationwidget.cpp, src/core/CMakeLists.txt,
-	src/core/gps/qgsgpsdconnection.cpp,
-	src/core/gps/qgsgpsdconnection.h, src/core/gps/qgsgpsdetector.cpp,
-	src/core/gps/qgsnmeaconnection.h,
-	src/ui/qgsgpsinformationwidgetbase.ui: [FEATURE] add gpsd support to
-	live gps tracking git-svn-id: http://svn.osgeo.org/qgis/trunk@14331
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-04  jef 
-
-	* python/CMakeLists.txt: fix cmake warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14330
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-04  timlinux 
-
-	* src/app/qgisapp.cpp, src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h, src/gui/qgisgui.cpp,
-	src/gui/qgisgui.h, src/ui/qgsrasterlayerpropertiesbase.ui: Added
-	option to save histogram and also refactored dialog filetype list
-	for saving images into qgisgui git-svn-id: http://svn.osgeo.org/qgis/trunk@14328
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-04  jef 
-
-	* src/app/qgswmssourceselect.cpp: add geoimage austria wms to
-	default servers git-svn-id: http://svn.osgeo.org/qgis/trunk@14327
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-03  mhugent 
-
-	* src/gui/qgscomposerview.cpp: [FEATURE]: Composer items can also be
-	deleted with the backspace key. Especially usefull for keyboards
-	without delete (frequent e.g. on Macs) git-svn-id: http://svn.osgeo.org/qgis/trunk@14326
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-03  jef 
-
-	* python/CMakeLists.txt: fix for #2985 (take III) git-svn-id: http://svn.osgeo.org/qgis/trunk@14325
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-03  jef 
-
-	* cmake/FindSIP.cmake, cmake/FindSIP.py, python/CMakeLists.txt: fix
-	for #2985 (take II) git-svn-id: http://svn.osgeo.org/qgis/trunk@14324
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-03  jef 
-
-	* python/CMakeLists.txt, python/core/conversions.sip: fix for #2985 git-svn-id: http://svn.osgeo.org/qgis/trunk@14323
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-02  mhugent 
-
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Block spinbox
-	signals in simple fill widget while setting offset. Fixes bug #3073 git-svn-id: http://svn.osgeo.org/qgis/trunk@14322
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-10-01  mhugent 
-
-	* src/app/composer/qgscomposerpicturewidget.cpp: Remember user
-	specified image directories in composerimage widget. Fixes bug #3072 git-svn-id: http://svn.osgeo.org/qgis/trunk@14321
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* src/app/qgsrasterlayerproperties.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14320
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* Doxyfile, doc/modules.dox,
-	src/analysis/interpolation/DualEdgeTriangulation.h,
-	src/analysis/interpolation/Triangulation.h,
-	src/analysis/interpolation/qgstininterpolator.h,
-	src/analysis/vector/qgsgeometryanalyzer.h,
-	src/analysis/vector/qgsoverlayanalyzer.h,
-	src/core/composer/qgscomposerarrow.h,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposeritemgroup.h,
-	src/core/composer/qgscomposerlabel.h,
-	src/core/composer/qgscomposerlegend.h,
-	src/core/composer/qgscomposermap.h,
-	src/core/composer/qgscomposerpicture.h,
-	src/core/composer/qgscomposerscalebar.h,
-	src/core/composer/qgscomposershape.h,
-	src/core/composer/qgspaperitem.h,
-	src/core/composer/qgsscalebarstyle.h,
-	src/core/composer/qgssingleboxscalebarstyle.h,
-	src/core/composer/qgsticksscalebarstyle.h,
-	src/core/qgsapplication.h, src/core/qgscoordinatereferencesystem.h,
-	src/core/qgscoordinatetransform.h, src/core/qgsdataprovider.h,
-	src/core/qgsfield.h, src/core/qgsgeometry.h,
-	src/core/qgshttptransaction.h, src/core/qgslabel.h,
-	src/core/qgsmaplayer.h, src/core/qgsnetworkaccessmanager.cpp,
-	src/core/qgspallabeling.h, src/core/qgsproject.cpp,
-	src/core/qgsproject.h, src/core/qgsprojectproperty.cpp,
-	src/core/qgsprojectproperty.h, src/core/qgsrasterdataprovider.h,
-	src/core/qgstolerance.h, src/core/qgsvectordataprovider.h,
-	src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayer.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/renderer/qgsgraduatedsymbolrenderer.h,
-	src/core/renderer/qgsrenderer.h,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.h,
-	src/core/symbology/qgsmarkercatalogue.h, src/gui/qgisgui.h,
-	src/gui/qgisinterface.h, src/gui/qgsattributeeditor.h,
-	src/gui/qgsgenericprojectionselector.cpp, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapcanvassnapper.h, src/gui/qgsmaptip.h,
-	src/gui/qgsprojectbadlayerguihandler.h,
-	src/gui/qgsprojectionselector.h, src/gui/qgsquickprint.h,
-	src/gui/qgsrubberband.h, src/mapserver/qgsconfigcache.h,
-	src/mapserver/qgssldrule.h, src/mapserver/qgswmsserver.h,
-	src/plugins/qgisplugin.h, src/plugins/qgsapplydialog.h: doxygen
-	fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@14319
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* src/app/qgswmssourceselect.cpp: fix WMS selection git-svn-id: http://svn.osgeo.org/qgis/trunk@14318
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* CMakeLists.txt, INSTALL, doc/INSTALL.t2t, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h: QWT now required git-svn-id: http://svn.osgeo.org/qgis/trunk@14317
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* src/providers/spatialite/qgsspatialiteprovider.cpp: missed a
-	comment in r14298 git-svn-id: http://svn.osgeo.org/qgis/trunk@14316
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-30  jef 
-
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp: fix build
-	errors git-svn-id: http://svn.osgeo.org/qgis/trunk@14315
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-29  jef 
-
-	* images/north_arrows/CMakeLists.txt,
-	resources/context_help/MapServerExport-es_ES,
-	resources/context_help/QgsVectorLayerProperties-pt_BR,
-	resources/context_help/QgsWMSSourceSelect-pt_BR,
-	resources/context_help/eVisDatabaseConnectionGui-es_ES,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/core/composer/qgscomposerlegend.cpp, src/core/qgsmaplayer.cpp,
-	src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h,
-	src/core/raster/qgscolorrampshader.h,
-	src/core/raster/qgsrastershader.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/gps_importer/qgsgpsplugingui.cpp,
-	src/python/qgspythonutilsimpl.cpp: automatic indentation update
-	(r13658-r14312) git-svn-id: http://svn.osgeo.org/qgis/trunk@14313
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-29  jef 
-
-	* src/plugins/plugin_template/README.whatnext: api documentation on
-	qgis.org git-svn-id: http://svn.osgeo.org/qgis/trunk@14312
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-29  jef 
-
-	* ms-windows/osgeo4w/package.cmd: GRASS 6.4.0 in OSgeo4W git-svn-id: http://svn.osgeo.org/qgis/trunk@14311
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-29  cfarmer 
-
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui: Adds three new
-	classification modes to graduated symbol renderer (version 2),
-	including Natural Breaks (Jenks), Standard Deviations, and Pretty
-	Breaks (based on pretty from the R statistical environment) git-svn-id: http://svn.osgeo.org/qgis/trunk@14308
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-28  mhugent 
-
-	* src/mapserver/qgis_map_serv.cpp: Possibility to set prefix path
-	for mapserver by environment variable git-svn-id: http://svn.osgeo.org/qgis/trunk@14303
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-27  jef 
-
-	* src/providers/spatialite/qgsspatialiteprovider.cpp: fix max/min
-	values in spatialite provider for non-numeric fields git-svn-id: http://svn.osgeo.org/qgis/trunk@14298
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4479cd7 b6e6147
+Marco Hugentobler 	2013-01-22
 
-2010-09-27  timlinux 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/ui/qgsrasterlayerpropertiesbase.ui: Zen minimalism for raster
-	graphing page git-svn-id: http://svn.osgeo.org/qgis/trunk@14296
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-22
 
-2010-09-26  borysiasty 
+    [Feature: Add more color options. Provided by olivierdalang]. Modifications for xml reading / writing
 
-	* i18n/qgis_pl_PL.ts: translation update: pl (last-minute commit
-	from a train for a qgis training;) git-svn-id: http://svn.osgeo.org/qgis/trunk@14288
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-22
 
-2010-09-26  kyngchaos 
+    Shorten code for xml reading / writing
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: sync with r14283; misc
-	cleanup; default single native arch to match compilation
-	instructions git-svn-id: http://svn.osgeo.org/qgis/trunk@14287
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-22
 
-2010-09-25  jef 
+    Shorten code for xml reading and writing
 
-	* src/gui/qgisinterface.h: missed a file in r14284 git-svn-id: http://svn.osgeo.org/qgis/trunk@14286
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-22
 
-2010-09-25  jef 
+    Avoid reseting of pen width if changing stroke color
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h: save feature attribute changes from
-	plugins to layer git-svn-id: http://svn.osgeo.org/qgis/trunk@14284
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-21
 
-2010-09-25  jef 
+    (remove useless code)
 
-	* python/core/qgsattributeaction.sip, src/app/CMakeLists.txt,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/qgsfeatureaction.cpp, src/app/qgsfeatureaction.h,
-	src/app/qgsidentifyresults.cpp, src/app/qgsidentifyresults.h,
-	src/app/qgsmaptoolidentify.cpp, src/core/qgsattributeaction.cpp,
-	src/core/qgsattributeaction.h, src/core/qgsfeature.cpp,
-	src/core/qgsvectorlayer.cpp: allow attribute and alias names in
-	actions git-svn-id: http://svn.osgeo.org/qgis/trunk@14283
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-21
 
-2010-09-25  jef 
+    QgsScalebar now saves colors in XML
 
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: also report provider
-	errors when not debugging git-svn-id: http://svn.osgeo.org/qgis/trunk@14281
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-21
 
-2010-09-24  mhugent 
+    Allow setting of font color in QgsComposerLegend
 
-	* src/mapserver/qgswmsserver.cpp: Flag geometry as derived attribute
-	in feature info git-svn-id: http://svn.osgeo.org/qgis/trunk@14279
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-20
 
-2010-09-23  jef 
+    (changed default color)
 
-	* src/core/qgsvectorfilewriter.cpp: fix #3036 git-svn-id: http://svn.osgeo.org/qgis/trunk@14276
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-20
 
-2010-09-23  mhugent 
+    color works for scalebars
 
-	* src/mapserver/qgswmsserver.cpp: [FEATURE]: append the feature
-	geometry to the feature info (probably make that optionally in the
-	future with a new request parameter) git-svn-id: http://svn.osgeo.org/qgis/trunk@14275
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+olivierdalang 	2013-01-20
 
-2010-09-23  timlinux 
+    remove always black text
+    this is unconsistant with the other drawText function and makes it impossble for a composer item to have a font color
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/ui/qgsrasterlayerpropertiesbase.ui: Use qwt to plot raster
-	rather than my my homegrown charting stuff git-svn-id: http://svn.osgeo.org/qgis/trunk@14274
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+redlegoreng 	2013-01-19
 
-2010-09-21  pcav 
+    ça marche tjs pas...
 
-	* i18n/qgis_it.ts: Typos in IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14270
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+redlegoreng 	2013-01-19
 
-2010-09-20  jef 
+    line color starts to work
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp: default to geometry postgres
-	tables git-svn-id: http://svn.osgeo.org/qgis/trunk@14267
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+redlegoreng 	2013-01-19
 
-2010-09-20  jef 
+    typo
 
-	* src/app/legend/qgslegend.cpp: fix #3021 git-svn-id: http://svn.osgeo.org/qgis/trunk@14266
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+redlegoreng 	2013-01-19
 
-2010-09-20  mhugent 
+    starting to refresh the scalebar composer item
 
-	* src/providers/wfs/qgswfsprovider.cpp: Fix typo in last commit git-svn-id: http://svn.osgeo.org/qgis/trunk@14265
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-22
 
-2010-09-20  mhugent 
+    Clone gradient in singleband gray renderer. Combine new opacity with existing one in mapserver
 
-	* python/core/qgsdataprovider.sip, python/core/qgsmaplayer.sip,
-	python/core/qgsmaplayerregistry.sip,
-	python/core/qgsrasterlayer.sip, python/core/qgsvectorlayer.sip,
-	src/app/qgisapp.cpp, src/core/qgsdataprovider.h,
-	src/core/qgsmaplayer.h, src/core/qgsmaplayerregistry.cpp,
-	src/core/qgsmaplayerregistry.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h, src/providers/wfs/qgswfsdata.cpp,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wfs/qgswfsprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: [FEATURE]: added reload method
-	to map layers and provider interface. Like this, caching providers
-	(currently WMS and WFS) can synchronize with changes in the
-	datasource git-svn-id: http://svn.osgeo.org/qgis/trunk@14264
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-22
 
-2010-09-19  jef 
+    Created test to replicate issue #7023
 
-	* i18n/qt_ar.ts, i18n/qt_de.ts, i18n/qt_es.ts, i18n/qt_fr.ts,
-	i18n/qt_ja_jp.ts, i18n/qt_pl.ts, i18n/qt_pt.ts, i18n/qt_ru.ts,
-	i18n/qt_sk.ts, i18n/qt_sv.ts, i18n/qt_uk.ts, i18n/qt_zh_CN.ts,
-	i18n/qt_zh_TW.ts, scripts/update_ts_files.sh: remove Qt translations
-	(fix #2855) git-svn-id: http://svn.osgeo.org/qgis/trunk@14260
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2013-01-22
 
-2010-09-19  jef 
+    Dont dump on every style conversion
 
-	* src/app/qgsmaptoolselectutils.cpp: apply #2973 git-svn-id: http://svn.osgeo.org/qgis/trunk@14259
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2013-01-22
 
-2010-09-19  jef 
+    fix output of the eliminate slivers polygon tool (fix 6925). Patch by
+    Bernhard Strobl
 
-	* src/core/qgsvectorlayer.cpp: fix postgres layer beautification git-svn-id: http://svn.osgeo.org/qgis/trunk@14258
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-21
 
-2010-09-19  jef 
+    [FEATURE] Add custom group box settings to Options
+    
+    - Add options to set group box title to bold, and to draw platform-consistent custom border and background
+    - Useful for group boxes on Ubuntu (default have no borders/backgrounds) and Mac (default are a bit funky-looking)
+    - NOT tested yet on Windows
 
-	* src/app/qgisapp.cpp: fix #3011 git-svn-id: http://svn.osgeo.org/qgis/trunk@14257
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 995ede3 0757e42
+Victor Olaya 	2013-01-21
 
-2010-09-19  macho 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
+    
+    Conflicts:
+python/plugins/sextante/algs/ftools/Difference.py           
+python/plugins/sextante/algs/ftools/Intersection.py           
+python/plugins/sextante/outputs/OutputTable.py           
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14256
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-21
 
-2010-09-19  jef 
+    added support for all gdal/ogr formats in all providers
+    added support for pre and post execution hooks
 
-	* src/app/legend/qgslegendgroup.cpp,
-	src/app/legend/qgslegendgroup.h: more comment fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@14254
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-21
 
-2010-09-19  jef 
+    fixed ftools overlay algorithms
+    code cleaning and minor edits in other algorithms
 
-	* src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp: add symbol
-	ASSERTions git-svn-id: http://svn.osgeo.org/qgis/trunk@14253
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-21
 
-2010-09-19  jef 
+    INSTALL: better note about short names.
 
-	* src/app/legend/qgslegenditem.cpp,
-	src/app/legend/qgslegendpropertygroup.cpp,
-	src/app/legend/qgslegendpropertygroup.h,
-	src/app/legend/qgslegendpropertyitem.cpp,
-	src/app/legend/qgslegendpropertyitem.h,
-	src/app/legend/qgslegendsymbologygroup.cpp,
-	src/app/legend/qgslegendsymbologygroup.h,
-	src/app/legend/qgslegendsymbologyitem.cpp,
-	src/app/legend/qgslegendsymbologyitem.h: comment fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@14252
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-21
 
-2010-09-19  jef 
+    wfs provider: copy geometry and attributes only if necessary
 
-	* src/app/qgisapp.cpp: fix #3022 git-svn-id: http://svn.osgeo.org/qgis/trunk@14251
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-18
 
-2010-09-19  mhugent 
+    Add adjustable Qt stylesheet class, QgisAppStyleSheet
+    
+    - [API] Remove individual stylesheet option functions (e.g. setFontSize) in favor of direct access to QgisAppStyleSheet functions
 
-	* src/mapserver/qgsprojectparser.cpp: Consider toplevel group in
-	mapserver git-svn-id: http://svn.osgeo.org/qgis/trunk@14250
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-21
 
-2010-09-18  jef 
+    Implement rewind() in wfs iterator
 
-	* src/app/qgsvectorlayerproperties.cpp: hide symbology on renderless
-	layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14249
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-21
 
-2010-09-18  jef 
+    Prevent concurrent wfs iterators for now
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/core/qgsdatasourceuri.cpp, src/core/qgsvectorlayer.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/ui/qgspgnewconnectionbase.ui: [FEATURE] allow adding
-	geometryless layers from postgres git-svn-id: http://svn.osgeo.org/qgis/trunk@14248
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-21
 
-2010-09-18  jef 
+    Fix incremental wfs loading
 
-	* python/core/qgssearchtreenode.sip,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/qgsfieldcalculator.cpp, src/app/qgssearchquerybuilder.cpp,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	tests/src/core/testqgssearchstring.cpp: [FEATURE] add search string
-	support for feature ids ($id) git-svn-id: http://svn.osgeo.org/qgis/trunk@14247
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-21
 
-2010-09-18  mhugent 
+    Change WFS provider for new vector api
 
-	* src/providers/wfs/qgswfsdata.cpp,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wfs/qgswfsprovider.h: Implement featureAtId for wfs
-	provider git-svn-id: http://svn.osgeo.org/qgis/trunk@14246
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2a4d79d bfb2b7a
+Larry Shaffer 	2013-01-20
 
-2010-09-18  mhugent 
+    Merge pull request #393 from dakcarto/options_re-org_5
+    
+    Reorganize Options dialog
 
-	* src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorlayer.cpp: 
-	Added two 0 pointer checks git-svn-id: http://svn.osgeo.org/qgis/trunk@14245
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-17  jef 
+    german translation update
 
-	* python/gui/qgisinterface.sip: missed a file in r14243 git-svn-id: http://svn.osgeo.org/qgis/trunk@14244
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-17  jef 
+    fix #7006 (if you actually use it)
 
-	* src/app/qgisappinterface.cpp, src/app/qgisappinterface.h,
-	src/gui/qgisinterface.h: implement #3015 git-svn-id: http://svn.osgeo.org/qgis/trunk@14243
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-18
 
-2010-09-16  timlinux 
+    use  raster format and pyramid save widgets in gdaltools (translate, dem, pyramids)
 
-	* src/app/qgisapp.cpp: Applied patch from #3005 - allow entry of
-	scale without leading 1: git-svn-id: http://svn.osgeo.org/qgis/trunk@14242
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-18
 
-2010-09-16  timlinux 
+    fix version test for gdal-1.10 (needs updates to widgets also)
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/ui/qgsattributetabledialog.ui: Applied patch to close #25 -
-	allow case insensitive search of attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@14241
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Etienne Tourigny 	2013-01-18
 
-2010-09-16  timlinux 
+    update raster format and pyramid save widgets for python, add pyramid config options support to raster writer, other fixes
 
-	* CONTRIBUTORS: Added attribution for some map icons git-svn-id: http://svn.osgeo.org/qgis/trunk@14240
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-16  timlinux 
+    fix #7006
 
-	* src/plugins/plugin_builder.py: Fixed small typo git-svn-id: http://svn.osgeo.org/qgis/trunk@14239
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 7809cbd 1910621
+Marco Hugentobler 	2013-01-18
 
-2010-09-16  macho 
+    Merge branch 'composer_inference_lines'
 
-	* TRANSLATORS: updated list of TRANSLATORS git-svn-id: http://svn.osgeo.org/qgis/trunk@14235
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-18
 
-2010-09-15  mhugent 
+    Show alignment rubber band on top
 
-	* src/gui/qgsmapcanvasitem.cpp: Improve update of canvas item in
-	case of size changes. Maybe fixes bug #2929 git-svn-id: http://svn.osgeo.org/qgis/trunk@14234
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-18
 
-2010-09-15  pcav 
+    Update composition sip bindings
 
-	* i18n/qgis_it.ts: More IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14232
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-18
 
-2010-09-15  timlinux 
+    Set alignment snap and tolerance for composition
 
-	* src/app/attributetable/qgsattributetabledialog.cpp: Fix for #889 -
-	show selection count in atribute table dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@14231
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-15  pcav 
+    about box: use webview for version info and use ok button
 
-	* src/plugins/grass/modules-common/v.kernel.qgm: Update to v.kernel
-	GRASS module - fixes #3009 git-svn-id: http://svn.osgeo.org/qgis/trunk@14230
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-14  jef 
+    use CPLFree on memory allocated by GDAL (fixes #7008)
 
-	* src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h,
-	src/providers/ogr/qgsogrprovider.cpp: fix #3001 git-svn-id: http://svn.osgeo.org/qgis/trunk@14228
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-18
 
-2010-09-14  jef 
+    Alignment snap also for item resize in composer
 
-	* src/core/qgsvectordataprovider.cpp: fix #3000 git-svn-id: http://svn.osgeo.org/qgis/trunk@14227
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-01-18
 
-2010-09-14  timlinux 
+    GRASS raster draw extent precission fix
 
-	* : New splash for 1.6 git-svn-id: http://svn.osgeo.org/qgis/trunk@14225
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-18
 
-2010-09-13  timlinux 
+    fix windows build
 
-	* src/app/qgisapp.cpp: Improved interaction with extents widget in
-	statusbar so that the text contents of the widget can be copied and
-	pasted git-svn-id: http://svn.osgeo.org/qgis/trunk@14222
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-17
 
-2010-09-11  macho 
+    Switch saving edits from Attribute Table dialog from connection to using public function
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14220
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-17
 
-2010-09-11  mhugent 
+    Minimize canvas refreshes during save/rollback/cancel current edits actions
 
-	* src/mapserver/qgswmsserver.cpp: Fix for memory leak in
-	getFeatureInfo (bug #2990) git-svn-id: http://svn.osgeo.org/qgis/trunk@14219
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-17
 
-2010-09-10  jef 
+    Fix #7007, canvas is not refreshing when exiting editing mode
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14218
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-17
 
-2010-09-10  jef 
+    Fix for #6992, GDAL create options help dialog shows up behind other dialogs on Mac
 
-	* src/app/legend/qgslegend.cpp: keep layer selection on legend right
-	click git-svn-id: http://svn.osgeo.org/qgis/trunk@14217
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-14
 
-2010-09-10  jef 
+    Reorganize Options dialog
+    
+    - Add Data Sources, Canvas/Legend sections
+    - Fix excess whitespace issue for list widget pane in QtDesigner and QGIS
+    - Switch GDAL drive table load to on current page name
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegenditem.cpp,
-	src/core/qgsgeometry.cpp, src/mapserver/qgswmsserver.cpp: add table
-	icon and fix warnings related to geometryless layers git-svn-id: http://svn.osgeo.org/qgis/trunk@14216
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a6c5fd8 e12d139
+rldhont 	2013-01-17
 
-2010-09-09  macho 
+    Merge pull request #392 from rldhont/new_vector_api
+    
+    Update QGIS WFS Server to use the new vector API
 
-	* i18n/qgis_de.ts: simple changes for better usability git-svn-id: http://svn.osgeo.org/qgis/trunk@14215
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2013-01-17
 
-2010-09-09  pcav 
+    Update QGIS WFS Server to use the new vector API
+    
+    This update needs to be tested. It should primarily test the
+    PROPERTYNAME parameter for GetFeature request, and test TRANSACTION.
+    This update it's just for compatibility. It should be good to update the
+    code to use all the new vector API capability.
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14207
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-17
 
-2010-09-08  timlinux 
+    Automatically update project files in qgis server
 
-	* src/core/qgscoordinatereferencesystem.cpp: Soft code start id for
-	user crs git-svn-id: http://svn.osgeo.org/qgis/trunk@14202
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2013-01-17
 
-2010-09-05  mhugent 
+    Followup d3981b8:
+    now it works properly with pylupdate4
 
-	* src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui: Apply
-	patch #2948 from Stefan Ziegler (PDF map for georeferencer) git-svn-id: http://svn.osgeo.org/qgis/trunk@14192
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-17
 
-2010-09-04  mhugent 
+    Cleanup code for composer item align
 
-	* python/core/qgsdistancearea.sip, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsmeasuredialog.h, src/app/qgsoptions.cpp,
-	src/core/qgsdistancearea.cpp, src/core/qgsdistancearea.h,
-	src/ui/qgsoptionsbase.ui: Apply patch #2936 (Units and decimal
-	places of measure tools) from Stefan Ziegler with small
-	modifications git-svn-id: http://svn.osgeo.org/qgis/trunk@14191
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 79d7246 3fe0f99
+Werner Macho 	2013-01-17
 
-2010-09-04  mhugent 
+    Merge pull request #390 from gioman/master
+    
+    More pt_PT translations by Nelson Silva
 
-	* src/core/qgsvectorlayer.cpp: Return NoGeometry type if provider is
-	attribute only git-svn-id: http://svn.osgeo.org/qgis/trunk@14190
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a928d51 629fa5a
+Werner Macho 	2013-01-17
 
-2010-09-03  mhugent 
+    Merge pull request #391 from slarosa/gdal_tools_issue
+    
+    fix typo in gdal tools
 
-	* src/core/qgsclipper.cpp: More efficient clipping parameter (same
-	as in threading branch) git-svn-id: http://svn.osgeo.org/qgis/trunk@14185
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2013-01-17
 
-2010-09-02  jef 
+    fix typo in gdal tools
 
-	* src/app/qgsattributedialog.cpp, src/gui/qgsattributeeditor.cpp: 
-	fix #2978 git-svn-id: http://svn.osgeo.org/qgis/trunk@14183
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-17
 
-2010-09-02  mhugent 
+    Show alignment lines
 
-	* src/core/pal/feature.cpp: Fix another memory leak git-svn-id: http://svn.osgeo.org/qgis/trunk@14178
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-09-01  jef 
-
-	* src/core/qgsvectorfilewriter.cpp: fix memory leak git-svn-id: http://svn.osgeo.org/qgis/trunk@14177
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2013-01-17
 
-2010-09-01  mhugent 
+    [FEATURE]: snap to left/mid/right coordinates of other items when moving composer items
 
-	* src/core/pal/feature.cpp: Fix memory leak git-svn-id: http://svn.osgeo.org/qgis/trunk@14173
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-16
 
-2010-09-01  mhugent 
+    Update of providers' feature iterators
+    
+    Currently providers do not support concurrent access of more iterators at once, so keep pointer to the currently active iterator and auto-close previous iterator when a new one is requested.
+    Auto-close iterators when all features have been set.
+    Auto-close iterators when the provider is deleted.
 
-	* src/app/legend/qgslegendlayer.cpp, src/core/qgis.h,
-	src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: Support for
-	non-spatial tables with delimited text provider. Legend shows a
-	table icon for non-spatial layers (also possible with ogr) git-svn-id: http://svn.osgeo.org/qgis/trunk@14172
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-31  mhugent 
+Larry Shaffer 	2013-01-15
 
-	* src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgswmsserver.cpp: Fix feature info in mapserver git-svn-id: http://svn.osgeo.org/qgis/trunk@14171
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-29  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: old cvs cleanup
-	(r14165); context_help updates (r14166, r14168) git-svn-id: http://svn.osgeo.org/qgis/trunk@14169
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-28  jef 
-
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsVectorLayerSaveAsDialog-de_DE: german
-	translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14168
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-28  jef 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp: [FEATURE] allow selection and removal of
-	several layers at once git-svn-id: http://svn.osgeo.org/qgis/trunk@14167
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-28  jef 
+    Turn on all edit triggers and set minimum heights for custom/current env vars tables
+    
+    - Set minimum heights for all table widgets in Options->System
 
-	* python/core/qgsvectorfilewriter.sip,
-	resources/context_help/QgsVectorLayerSaveAsDialog-en_US,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.h, src/app/qgisapp.cpp,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h,
-	src/ui/qgsvectorlayersaveasdialogbase.ui: [FEATURE] add support for
-	OGR creation options to and improve error handling of file writer git-svn-id: http://svn.osgeo.org/qgis/trunk@14166
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-28  jef 
-
-	* .cvsignore, doc/.cvsignore, doc/images/.cvsignore,
-	doc/plugins/.cvsignore, doc/plugins/delimited_text/.cvsignore,
-	doc/plugins/geoprocessing/.cvsignore,
-	doc/plugins/geoprocessing/buffer/.cvsignore, i18n/.cvsignore,
-	images/.cvsignore, images/developers/.cvsignore,
-	images/icons/.cvsignore, images/north_arrows/.cvsignore,
-	images/splash/.cvsignore, images/svg/.cvsignore,
-	images/svg/biology/.cvsignore, images/svg/geometric/.cvsignore,
-	images/svg/gpsicons/.cvsignore, images/svg/icon/.cvsignore,
-	images/svg/north_arrows/.cvsignore, images/svg/symbol/.cvsignore,
-	images/themes/.cvsignore, images/themes/classic/.cvsignore,
-	images/themes/default/.cvsignore, images/themes/nkids/.cvsignore,
-	resources/.cvsignore, src/app/.cvsignore,
-	src/app/legend/.cvsignore, src/helpviewer/.cvsignore,
-	src/mac/.cvsignore, src/mac/Contents/.cvsignore,
-	src/mac/Contents/Resources/.cvsignore, src/plugins/.cvsignore,
-	src/plugins/copyright_label/.cvsignore,
-	src/plugins/delimited_text/.cvsignore,
-	src/plugins/geoprocessing/.cvsignore,
-	src/plugins/georeferencer/.cvsignore,
-	src/plugins/gps_importer/.cvsignore, src/plugins/grass/.cvsignore,
-	src/plugins/grass/modules-common/.cvsignore,
-	src/plugins/grass/themes/.cvsignore,
-	src/plugins/grass/themes/classic/.cvsignore,
-	src/plugins/grass/themes/default/.cvsignore,
-	src/plugins/north_arrow/.cvsignore,
-	src/plugins/scale_bar/.cvsignore, src/plugins/spit/.cvsignore,
-	src/providers/.cvsignore, src/providers/delimitedtext/.cvsignore,
-	src/providers/gpx/.cvsignore, src/providers/grass/.cvsignore,
-	src/providers/ogr/.cvsignore, src/providers/postgres/.cvsignore,
-	src/providers/wms/.cvsignore, src/ui/.cvsignore,
-	tests/algorithms/projections/.cvsignore,
-	tests/algorithms/qgsproject/.cvsignore, tools/.cvsignore,
-	tools/qgis_config/.cvsignore: remove .cvsignore files git-svn-id: http://svn.osgeo.org/qgis/trunk@14165
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-15
 
-2010-08-28  jef 
-
-	* python/core/conversions.sip, python/gui/qgslegendinterface.sip: 
-	add sip bindings for groupLayerRelationship (fixes #2969) git-svn-id: http://svn.osgeo.org/qgis/trunk@14164
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-27  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@14162
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-27  jef 
-
-	* src/core/qgssearchstringparser.yy: fix bison warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@14158
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-27  jef 
-
-	* debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick, debian/control.sid,
-	debian/control.squeeze: fix debian dependency git-svn-id: http://svn.osgeo.org/qgis/trunk@14157
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-27  jef 
-
-	* src/app/qgsquerybuilder.h, src/app/qgssearchquerybuilder.cpp,
-	src/app/qgssearchquerybuilder.h, src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: add ilike, in and not in to search
-	string git-svn-id: http://svn.osgeo.org/qgis/trunk@14156
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-27  jef 
-
-	* src/core/qgssearchstringlexer.ll, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: add lower/upper support to search
-	string (fixes #2970) git-svn-id: http://svn.osgeo.org/qgis/trunk@14154
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-26  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: followup r14150
-	again git-svn-id: http://svn.osgeo.org/qgis/trunk@14152
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-26  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: followup r14150 git-svn-id: http://svn.osgeo.org/qgis/trunk@14151
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-26  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: fix for postgis
-	data crossing the dateline git-svn-id: http://svn.osgeo.org/qgis/trunk@14150
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-26  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: remove old snow python
-	32/64bit hacks for pyuic (use pyqt 4.7+) git-svn-id: http://svn.osgeo.org/qgis/trunk@14149
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-26  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync with r14131 git-svn-id: http://svn.osgeo.org/qgis/trunk@14148
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-25  macho 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp: 
-	fix iconnames git-svn-id: http://svn.osgeo.org/qgis/trunk@14147
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-25  jef 
-
-	* src/plugins/grass/qtermwidget/kpty.cpp: fix kpty on BSD (#2021) git-svn-id: http://svn.osgeo.org/qgis/trunk@14146
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-24  jef 
-
-	* src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h,
-	src/ui/qgsfieldcalculatorbase.ui: add concat button to field
-	calculator git-svn-id: http://svn.osgeo.org/qgis/trunk@14138
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-23  timlinux 
-
-	* images/svg/CMakeLists.txt,
-	images/svg/accommodation/accommodation_alpinehut.svg,
-	images/svg/accommodation/accommodation_bed_and_breakfast.svg,
-	images/svg/accommodation/accommodation_camping.svg,
-	images/svg/accommodation/accommodation_caravan_park.svg,
-	images/svg/accommodation/accommodation_hotel.svg,
-	images/svg/accommodation/accommodation_hotel2.svg,
-	images/svg/accommodation/accommodation_shelter.svg,
-	images/svg/accommodation/accommodation_shelter2.svg,
-	images/svg/accommodation/accommodation_youth_hostel.svg,
-	images/svg/amenity/amenity_bench.svg,
-	images/svg/amenity/amenity_court.svg,
-	images/svg/amenity/amenity_firestation.svg,
-	images/svg/amenity/amenity_firestation2.svg,
-	images/svg/amenity/amenity_firestation3.svg,
-	images/svg/amenity/amenity_fountain.svg,
-	images/svg/amenity/amenity_information.svg,
-	images/svg/amenity/amenity_library.svg,
-	images/svg/amenity/amenity_police.svg,
-	images/svg/amenity/amenity_police2.svg,
-	images/svg/amenity/amenity_post_box.svg,
-	images/svg/amenity/amenity_post_office.svg,
-	images/svg/amenity/amenity_prison.svg,
-	images/svg/amenity/amenity_recycling.svg,
-	images/svg/amenity/amenity_survey_point.svg,
-	images/svg/amenity/amenity_telephone.svg,
-	images/svg/amenity/amenity_toilets.svg,
-	images/svg/amenity/amenity_toilets_disabled.svg,
-	images/svg/amenity/amenity_toilets_men.svg,
-	images/svg/amenity/amenity_toilets_women.svg,
-	images/svg/amenity/amenity_waste_bin.svg,
-	images/svg/food/food_bar.svg, images/svg/food/food_cafe.svg,
-	images/svg/food/food_drinkingtap.svg,
-	images/svg/food/food_fastfood.svg,
-	images/svg/food/food_fastfood2.svg, images/svg/food/food_pub.svg,
-	images/svg/food/food_restaurant.svg,
-	images/svg/health/health_dentist.svg,
-	images/svg/health/health_doctors.svg,
-	images/svg/health/health_hospital.svg,
-	images/svg/health/health_hospital_emergency.svg,
-	images/svg/health/health_hospital_emergency2.svg,
-	images/svg/health/health_opticians.svg,
-	images/svg/health/health_pharmacy.svg,
-	images/svg/health/health_pharmacy_dispencing.svg,
-	images/svg/health/health_veterinary.svg,
-	images/svg/money/money_atm.svg, images/svg/money/money_atm2.svg,
-	images/svg/money/money_bank.svg, images/svg/money/money_bank2.svg,
-	images/svg/money/money_currency_exchange.svg,
-	images/svg/religion/place_of_worship.svg,
-	images/svg/religion/place_of_worship_bahai.svg,
-	images/svg/religion/place_of_worship_bahai3.svg,
-	images/svg/religion/place_of_worship_buddhist.svg,
-	images/svg/religion/place_of_worship_buddhist3.svg,
-	images/svg/religion/place_of_worship_christian.svg,
-	images/svg/religion/place_of_worship_christian3.svg,
-	images/svg/religion/place_of_worship_hindu.svg,
-	images/svg/religion/place_of_worship_hindu3.svg,
-	images/svg/religion/place_of_worship_islamic.svg,
-	images/svg/religion/place_of_worship_islamic3.svg,
-	images/svg/religion/place_of_worship_jain.svg,
-	images/svg/religion/place_of_worship_jain3.svg,
-	images/svg/religion/place_of_worship_jewish.svg,
-	images/svg/religion/place_of_worship_jewish3.svg,
-	images/svg/religion/place_of_worship_shinto.svg,
-	images/svg/religion/place_of_worship_shinto3.svg,
-	images/svg/religion/place_of_worship_sikh.svg,
-	images/svg/religion/place_of_worship_sikh3.svg,
-	images/svg/religion/place_of_worship_unknown3.svg,
-	images/svg/shopping/shopping_alcohol.svg,
-	images/svg/shopping/shopping_bakery.svg,
-	images/svg/shopping/shopping_bicycle.svg,
-	images/svg/shopping/shopping_book.svg,
-	images/svg/shopping/shopping_butcher.svg,
-	images/svg/shopping/shopping_car.svg,
-	images/svg/shopping/shopping_car_repair.svg,
-	images/svg/shopping/shopping_clothes.svg,
-	images/svg/shopping/shopping_confectionery.svg,
-	images/svg/shopping/shopping_convenience.svg,
-	images/svg/shopping/shopping_diy.svg,
-	images/svg/shopping/shopping_estateagent.svg,
-	images/svg/shopping/shopping_estateagent2.svg,
-	images/svg/shopping/shopping_estateagent3.svg,
-	images/svg/shopping/shopping_fish.svg,
-	images/svg/shopping/shopping_garden_centre.svg,
-	images/svg/shopping/shopping_gift.svg,
-	images/svg/shopping/shopping_greengrocer.svg,
-	images/svg/shopping/shopping_hairdresser.svg,
-	images/svg/shopping/shopping_hifi.svg,
-	images/svg/shopping/shopping_jewelry.svg,
-	images/svg/shopping/shopping_laundrette.svg,
-	images/svg/shopping/shopping_mobile_phone.svg,
-	images/svg/shopping/shopping_motorcycle.svg,
-	images/svg/shopping/shopping_music.svg,
-	images/svg/shopping/shopping_pet.svg,
-	images/svg/shopping/shopping_pet2.svg,
-	images/svg/shopping/shopping_photo.svg,
-	images/svg/shopping/shopping_supermarket.svg,
-	images/svg/shopping/shopping_tackle.svg,
-	images/svg/shopping/shopping_video_rental.svg,
-	images/svg/sport/sport_archery.svg,
-	images/svg/sport/sport_baseball.svg,
-	images/svg/sport/sport_cricket.svg,
-	images/svg/sport/sport_diving.svg, images/svg/sport/sport_golf.svg,
-	images/svg/sport/sport_gym.svg,
-	images/svg/sport/sport_gymnasium.svg,
-	images/svg/sport/sport_gymnasium2.svg,
-	images/svg/sport/sport_hillclimbing.svg,
-	images/svg/sport/sport_horse_racing.svg,
-	images/svg/sport/sport_iceskating.svg,
-	images/svg/sport/sport_jetski.svg,
-	images/svg/sport/sport_leisure_centre.svg,
-	images/svg/sport/sport_motorracing.svg,
-	images/svg/sport/sport_playground.svg,
-	images/svg/sport/sport_sailing.svg,
-	images/svg/sport/sport_skiing_crosscountry.svg,
-	images/svg/sport/sport_skiing_downhill.svg,
-	images/svg/sport/sport_snooker.svg,
-	images/svg/sport/sport_soccer.svg,
-	images/svg/sport/sport_swimming_indoor.svg,
-	images/svg/sport/sport_swimming_outdoor.svg,
-	images/svg/sport/sport_tennis.svg,
-	images/svg/sport/sport_windsurfing.svg,
-	images/svg/symbol/blank.svg, images/svg/symbol/blank_font.svg,
-	images/svg/symbol/education_nursery.svg,
-	images/svg/symbol/education_school.svg,
-	images/svg/symbol/education_university.svg,
-	images/svg/symbol/fountain.svg,
-	images/svg/symbol/landuse_coniferous.svg,
-	images/svg/symbol/landuse_coniferous_and_deciduous.svg,
-	images/svg/symbol/landuse_deciduous.svg,
-	images/svg/symbol/landuse_grass.svg,
-	images/svg/symbol/landuse_hills.svg,
-	images/svg/symbol/landuse_quary.svg,
-	images/svg/symbol/landuse_scrub.svg,
-	images/svg/symbol/landuse_swamp.svg,
-	images/svg/symbol/poi_boundary_administrative.svg,
-	images/svg/symbol/poi_cave.svg, images/svg/symbol/poi_embassy.svg,
-	images/svg/symbol/poi_embassy2.svg,
-	images/svg/symbol/poi_military_bunker.svg,
-	images/svg/symbol/poi_mine.svg,
-	images/svg/symbol/poi_mine_abandoned.svg,
-	images/svg/symbol/poi_peak.svg,
-	images/svg/symbol/poi_place_city.svg,
-	images/svg/symbol/poi_place_town.svg,
-	images/svg/symbol/poi_place_village.svg,
-	images/svg/symbol/poi_point_of_interest.svg,
-	images/svg/symbol/poi_tower_communications.svg,
-	images/svg/symbol/poi_tower_power.svg,
-	images/svg/symbol/poi_tower_water.svg,
-	images/svg/symbol/water_tower.svg,
-	images/svg/tourist/tourist_archaeological.svg,
-	images/svg/tourist/tourist_archaeological2.svg,
-	images/svg/tourist/tourist_art_gallery.svg,
-	images/svg/tourist/tourist_art_gallery2.svg,
-	images/svg/tourist/tourist_battlefield.svg,
-	images/svg/tourist/tourist_beach.svg,
-	images/svg/tourist/tourist_casino.svg,
-	images/svg/tourist/tourist_castle.svg,
-	images/svg/tourist/tourist_cinema.svg,
-	images/svg/tourist/tourist_cinema2.svg,
-	images/svg/tourist/tourist_fountain.svg,
-	images/svg/tourist/tourist_memorial.svg,
-	images/svg/tourist/tourist_monument.svg,
-	images/svg/tourist/tourist_museum.svg,
-	images/svg/tourist/tourist_picnic.svg,
-	images/svg/tourist/tourist_ruin.svg,
-	images/svg/tourist/tourist_steam_train.svg,
-	images/svg/tourist/tourist_theatre.svg,
-	images/svg/tourist/tourist_view_point.svg,
-	images/svg/tourist/tourist_waterwheel.svg,
-	images/svg/tourist/tourist_windmill.svg,
-	images/svg/tourist/tourist_wreck.svg,
-	images/svg/tourist/tourist_zoo.svg,
-	images/svg/tourist/tourisum_fountain.svg,
-	images/svg/transport/barrier_bollard.svg,
-	images/svg/transport/barrier_enterance.svg,
-	images/svg/transport/barrier_gate.svg,
-	images/svg/transport/barrier_lift_gate.svg,
-	images/svg/transport/barrier_stile.svg,
-	images/svg/transport/barrier_toll_booth.svg,
-	images/svg/transport/transport_aerodrome.svg,
-	images/svg/transport/transport_aerodrome2.svg,
-	images/svg/transport/transport_airport.svg,
-	images/svg/transport/transport_airport2.svg,
-	images/svg/transport/transport_bus_station.svg,
-	images/svg/transport/transport_bus_stop.svg,
-	images/svg/transport/transport_bus_stop2.svg,
-	images/svg/transport/transport_car_share.svg,
-	images/svg/transport/transport_ford.svg,
-	images/svg/transport/transport_fuel.svg,
-	images/svg/transport/transport_fuel_lpg.svg,
-	images/svg/transport/transport_lighthouse.svg,
-	images/svg/transport/transport_marina.svg,
-	images/svg/transport/transport_parking.svg,
-	images/svg/transport/transport_parking_bicycle.svg,
-	images/svg/transport/transport_parking_car.svg,
-	images/svg/transport/transport_parking_car_paid.svg,
-	images/svg/transport/transport_parking_disabled.svg,
-	images/svg/transport/transport_parking_private.svg,
-	images/svg/transport/transport_parking_private2.svg,
-	images/svg/transport/transport_parking_private3.svg,
-	images/svg/transport/transport_port.svg,
-	images/svg/transport/transport_rental_bicycle.svg,
-	images/svg/transport/transport_rental_car.svg,
-	images/svg/transport/transport_roundabout_anticlockwise.svg,
-	images/svg/transport/transport_roundabout_clockwise.svg,
-	images/svg/transport/transport_taxi_rank.svg,
-	images/svg/transport/transport_traffic_lights.svg,
-	images/svg/transport/transport_train_station.svg,
-	images/svg/transport/transport_train_station2.svg,
-	images/svg/transport/transport_tram_stop.svg: Added SJJB icons - see
-	http://www.sjjb.co.uk/mapicons/introduction git-svn-id: http://svn.osgeo.org/qgis/trunk@14131
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-23  timlinux 
-
-	* src/core/qgsvectorfilewriter.cpp: More useful debug error message
-	when trying to write a vector attribute with an invalid QVariant
-	type. Message displayed now looks like this: Invalid variant type
-	for field lon 1: Expected Type float : Received Value: 20.375 git-svn-id: http://svn.osgeo.org/qgis/trunk@14130
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-23  dassau 
-
-	* doc/CODING.t2t: updates and fixes from Volker Froehlich git-svn-id: http://svn.osgeo.org/qgis/trunk@14128
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: clean up grass build;
-	fix pyqt utility bundling error git-svn-id: http://svn.osgeo.org/qgis/trunk@14126
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: bundle pyqt utilities git-svn-id: http://svn.osgeo.org/qgis/trunk@14125
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: add mapserver (r14110,
-	r14120) git-svn-id: http://svn.osgeo.org/qgis/trunk@14124
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14122
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  jef 
-
-	* src/mapserver/qgssldparser.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@14121
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  mhugent 
-
-	* cmake_templates/qgsconfig.h.in, src/mapserver/qgis_map_serv.cpp: 
-	Use install prefix for the mapserver to locate vector provider libs git-svn-id: http://svn.osgeo.org/qgis/trunk@14120
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-22  jef 
-
-	* debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick, debian/control.sid,
-	debian/control.squeeze: debian packaging fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@14119
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* src/mapserver/qgsmsutils.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@14118
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* ms-windows/osgeo4w/package.cmd: include FCGI lib in osgeo4w build git-svn-id: http://svn.osgeo.org/qgis/trunk@14117
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  mhugent 
-
-	* src/mapserver/qgsgetrequesthandler.cpp: Fix problem with parameter
-	map in getrequesthandler git-svn-id: http://svn.osgeo.org/qgis/trunk@14116
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* debian/control: debian packaging fix git-svn-id: http://svn.osgeo.org/qgis/trunk@14115
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* debian/changelog, debian/control, debian/control.hardy,
-	debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.sid,
-	debian/control.squeeze, debian/qgis-common.install,
-	debian/qgis-mapserver.install,
-	debian/qgis-providers-common.install, debian/qgis-providers.install: 
-	debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@14114
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14113
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  jef 
-
-	* src/mapserver/qgis_map_serv.cpp,
-	src/mapserver/qgsbetweenfilter.cpp,
-	src/mapserver/qgsbetweenfilter.h,
-	src/mapserver/qgscomparisonfilter.cpp,
-	src/mapserver/qgscomparisonfilter.h,
-	src/mapserver/qgsconfigcache.cpp,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsepsgcache.cpp, src/mapserver/qgsfilter.cpp,
-	src/mapserver/qgsfilter.h, src/mapserver/qgsftptransaction.cpp,
-	src/mapserver/qgsftptransaction.h,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgsgetrequesthandler.h,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedrdsbuilder.h,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.h,
-	src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgshttprequesthandler.h,
-	src/mapserver/qgsinterpolationlayerbuilder.cpp,
-	src/mapserver/qgsinterpolationlayerbuilder.h,
-	src/mapserver/qgslogicalfilter.cpp,
-	src/mapserver/qgslogicalfilter.h,
-	src/mapserver/qgsmapserverlogger.cpp,
-	src/mapserver/qgsmapserverlogger.h,
-	src/mapserver/qgsmapserviceexception.cpp,
-	src/mapserver/qgsmapserviceexception.h,
-	src/mapserver/qgsmslayerbuilder.cpp,
-	src/mapserver/qgsmslayerbuilder.h,
-	src/mapserver/qgsmslayercache.cpp, src/mapserver/qgsmslayercache.h,
-	src/mapserver/qgsmsutils.cpp, src/mapserver/qgsmsutils.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h,
-	src/mapserver/qgsremotedatasourcebuilder.cpp,
-	src/mapserver/qgsremotedatasourcebuilder.h,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/mapserver/qgsremoteowsbuilder.h,
-	src/mapserver/qgsrequesthandler.h,
-	src/mapserver/qgssentdatasourcebuilder.cpp,
-	src/mapserver/qgssentdatasourcebuilder.h,
-	src/mapserver/qgssldparser.cpp, src/mapserver/qgssldparser.h,
-	src/mapserver/qgssldrenderer.cpp, src/mapserver/qgssldrenderer.h,
-	src/mapserver/qgssldrule.cpp, src/mapserver/qgssldrule.h,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgssoaprequesthandler.h,
-	src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h: 
-	mapserver indentation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14112
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  mhugent 
-
-	* cmake/FindFcgi.cmake: Also add cmake file for fcgi git-svn-id: http://svn.osgeo.org/qgis/trunk@14111
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-21  mhugent 
-
-	* CMakeLists.txt, debian/control.sid, debian/qgis.install,
-	debian/rules, src/CMakeLists.txt, src/mapserver/CMakeLists.txt,
-	src/mapserver/admin.sld, src/mapserver/common.xml,
-	src/mapserver/qgis_map_serv.cpp, src/mapserver/qgis_wms.xmi,
-	src/mapserver/qgsbetweenfilter.cpp,
-	src/mapserver/qgsbetweenfilter.h,
-	src/mapserver/qgscomparisonfilter.cpp,
-	src/mapserver/qgscomparisonfilter.h,
-	src/mapserver/qgsconfigcache.cpp, src/mapserver/qgsconfigcache.h,
-	src/mapserver/qgsconfigparser.cpp, src/mapserver/qgsconfigparser.h,
-	src/mapserver/qgsepsgcache.cpp, src/mapserver/qgsepsgcache.h,
-	src/mapserver/qgsfilter.cpp, src/mapserver/qgsfilter.h,
-	src/mapserver/qgsftptransaction.cpp,
-	src/mapserver/qgsftptransaction.h,
-	src/mapserver/qgsgetrequesthandler.cpp,
-	src/mapserver/qgsgetrequesthandler.h,
-	src/mapserver/qgshostedrdsbuilder.cpp,
-	src/mapserver/qgshostedrdsbuilder.h,
-	src/mapserver/qgshostedvdsbuilder.cpp,
-	src/mapserver/qgshostedvdsbuilder.h,
-	src/mapserver/qgshttprequesthandler.cpp,
-	src/mapserver/qgshttprequesthandler.h,
-	src/mapserver/qgsinterpolationlayerbuilder.cpp,
-	src/mapserver/qgsinterpolationlayerbuilder.h,
-	src/mapserver/qgslogicalfilter.cpp,
-	src/mapserver/qgslogicalfilter.h,
-	src/mapserver/qgsmapserverlogger.cpp,
-	src/mapserver/qgsmapserverlogger.h,
-	src/mapserver/qgsmapserviceexception.cpp,
-	src/mapserver/qgsmapserviceexception.h,
-	src/mapserver/qgsmslayerbuilder.cpp,
-	src/mapserver/qgsmslayerbuilder.h,
-	src/mapserver/qgsmslayercache.cpp, src/mapserver/qgsmslayercache.h,
-	src/mapserver/qgsmsutils.cpp, src/mapserver/qgsmsutils.h,
-	src/mapserver/qgsprojectparser.cpp,
-	src/mapserver/qgsprojectparser.h,
-	src/mapserver/qgsremotedatasourcebuilder.cpp,
-	src/mapserver/qgsremotedatasourcebuilder.h,
-	src/mapserver/qgsremoteowsbuilder.cpp,
-	src/mapserver/qgsremoteowsbuilder.h,
-	src/mapserver/qgsrequesthandler.h,
-	src/mapserver/qgssentdatasourcebuilder.cpp,
-	src/mapserver/qgssentdatasourcebuilder.h,
-	src/mapserver/qgssldparser.cpp, src/mapserver/qgssldparser.h,
-	src/mapserver/qgssldrenderer.cpp, src/mapserver/qgssldrenderer.h,
-	src/mapserver/qgssldrule.cpp, src/mapserver/qgssldrule.h,
-	src/mapserver/qgssoaprequesthandler.cpp,
-	src/mapserver/qgssoaprequesthandler.h,
-	src/mapserver/qgswmsserver.cpp, src/mapserver/qgswmsserver.h,
-	src/mapserver/sld_capabilities.txt, src/mapserver/wms_metadata.xml: 
-	[FEATURE]: Add QGIS mapserver sources to svn repository git-svn-id: http://svn.osgeo.org/qgis/trunk@14110
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-18  jef 
-
-	* src/app/qgisapp.cpp: make toolbuttons delayed git-svn-id: http://svn.osgeo.org/qgis/trunk@14109
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-18  brushtyler 
-
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/widgetOverview.ui: applied patch
-	attached to #2932 to improve build overviews (gdaltools).  Thanks to
-	Duarte! git-svn-id: http://svn.osgeo.org/qgis/trunk@14105
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-17  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: show selected selection or
-	measure tool in toolbutton git-svn-id: http://svn.osgeo.org/qgis/trunk@14102
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-17  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: select and measure toolbar
-	flyouts and submenus (followup #2938) git-svn-id: http://svn.osgeo.org/qgis/trunk@14101
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-17  jef 
-
-	* debian/changelog, debian/control, debian/control.hardy,
-	debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.maverick, debian/control.sid, debian/control.squeeze: 
-	fix r14087 git-svn-id: http://svn.osgeo.org/qgis/trunk@14096
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  jef 
-
-	* src/providers/wms/qgswmsprovider.cpp: improve legacy support for
-	CRS/SRS in wms provider git-svn-id: http://svn.osgeo.org/qgis/trunk@14090
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  jef 
-
-	* scripts/update_ts_files.sh: fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@14089
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  jef 
-
-	* src/app/qgsmaptoolcapture.cpp: fix #790 again git-svn-id: http://svn.osgeo.org/qgis/trunk@14088
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  jef 
-
-	* debian/changelog, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick, debian/control.sid,
-	debian/control.squeeze: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@14087
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync with r14071 git-svn-id: http://svn.osgeo.org/qgis/trunk@14086
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-16  ersts 
-
-	* src/app/qgisapp.cpp, src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h,
-	src/core/raster/qgscolorrampshader.cpp,
-	src/core/raster/qgscolorrampshader.h,
-	src/core/raster/qgsrasterlayer.h,
-	src/ui/qgsrasterlayerpropertiesbase.ui: -Added ability to
-	interactively select pixels from the canvas to populate the
-	transparency table in the raster layer properties dialog -Closes
-	ticket #2259 -Updated the color ramp shader to empty the color cache
-	when a new color ramp is set git-svn-id: http://svn.osgeo.org/qgis/trunk@14085
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-14  jef 
-
-	* debian/control.maverick: fix ubuntu maverick dependency git-svn-id: http://svn.osgeo.org/qgis/trunk@14084
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-14  jef 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts, i18n/qgis_th.ts,
-	i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: revert rest of r14077 and
-	another update_ts_run git-svn-id: http://svn.osgeo.org/qgis/trunk@14083
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Increase relative height of custom/current env vars table headers
 
-2010-08-14  mhugent 
+Larry Shaffer 	2013-01-15
 
-	* src/app/composer/qgscomposer.cpp: Avoid overwriting of printing
-	page with width/height from composition git-svn-id: http://svn.osgeo.org/qgis/trunk@14082
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update Options dialog vertical tabs after paintEvent, instead of on resize
+    
+    - Allows full updating of icon-only mode on OSes that emit only one resize event
 
-2010-08-14  jef 
+Giovanni Manghi 	2013-01-15
 
-	* scripts/create_new_ts.sh, scripts/update_ts_files.sh: fix
-	create_new_ts.sh git-svn-id: http://svn.osgeo.org/qgis/trunk@14081
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More pt_PT translations by Nelson Silva
 
-2010-08-14  jef 
+Juergen E. Fischer 	2013-01-15
 
-	* i18n/qgis_de.ts: german translation update (and r14077 reversion) git-svn-id: http://svn.osgeo.org/qgis/trunk@14080
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build
 
-2010-08-14  borysiasty 
+Salvatore Larosa 	2013-01-15
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@14079
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update translation for Python Console
 
-2010-08-14  borysiasty 
+Merge: ce64ede a1743ab
+mhugent 	2013-01-15
 
-	* scripts/update_ts_files.sh: add python console strings to
-	translations git-svn-id: http://svn.osgeo.org/qgis/trunk@14078
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #388 from mwa/offline_editing_api
+    
+    Move QgsOfflineEditing to core
 
-2010-08-13  macho 
+Mathias Walker 	2013-01-15
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_pt_PT.ts,
-	i18n/qgis_ro.ts, i18n/qgis_ru.ts, i18n/qgis_sk.ts,
-	i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts, i18n/qgis_th.ts,
-	i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts, i18n/qgis_xh.ts,
-	i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: added new language pt_PT and
-	the usual string update git-svn-id: http://svn.osgeo.org/qgis/trunk@14077
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move QgsOfflineEditing to core and add SIP bindings; refactor Offline Editing Plugin
 
-2010-08-13  jef 
+Merge: 0357f0f 6768327
+Tim Sutton 	2013-01-15
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@14075
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #387 from slarosa/pyqgis-console
+    
+    Add QgsMessageBar for pyqgis console
 
-2010-08-13  brushtyler 
+Salvatore Larosa 	2013-01-15
 
-	* python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/widgetTranslate.ui: fixed nodata max
-	and min value corrected the spinboxes width fixed issue using
-	Arc/Info ASCII Grid as output format git-svn-id: http://svn.osgeo.org/qgis/trunk@14074
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add QgsMessageBar for pyqgis console
 
-2010-08-12  jef 
+Merge: bdcb6c1 ca77a98
+mhugent 	2013-01-15
 
-	* src/plugins/georeferencer/CMakeLists.txt: add GEOS_INCLUDE_DIR to
-	georeferencer git-svn-id: http://svn.osgeo.org/qgis/trunk@14073
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #386 from Oslandia/atlas
+    
+    Fix atlas map resizing
 
-2010-08-12  jef 
+Larry Shaffer 	2013-01-14
 
-	* src/gui/qgsrubberband.cpp: fix linux build git-svn-id: http://svn.osgeo.org/qgis/trunk@14072
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add mousePressEvent to QgsMessageBar sip file
 
-2010-08-12  jef 
+Juergen E. Fischer 	2013-01-14
 
-	* images/images.qrc, images/themes/default/selectTools.svg,
-	python/gui/qgisinterface.sip, python/gui/qgsrubberband.sip,
-	src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgisappinterface.cpp, src/app/qgisappinterface.h,
-	src/app/qgsmaptoolselect.cpp, src/app/qgsmaptoolselect.h,
-	src/app/qgsmaptoolselectfreehand.cpp,
-	src/app/qgsmaptoolselectfreehand.h,
-	src/app/qgsmaptoolselectpolygon.cpp,
-	src/app/qgsmaptoolselectpolygon.h,
-	src/app/qgsmaptoolselectradius.cpp,
-	src/app/qgsmaptoolselectradius.h,
-	src/app/qgsmaptoolselectrectangle.cpp,
-	src/app/qgsmaptoolselectrectangle.h,
-	src/app/qgsmaptoolselectutils.cpp, src/app/qgsmaptoolselectutils.h,
-	src/gui/qgisinterface.h, src/gui/qgsrubberband.cpp,
-	src/gui/qgsrubberband.h,
-	src/plugins/coordinate_capture/CMakeLists.txt: add advanced
-	selection tools from Jeremy Palmer. Thanks. (apply #2938) git-svn-id: http://svn.osgeo.org/qgis/trunk@14071
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more oracle provider improvements:
+    - enable warnings and more error handling in qocispatial
+    - read ordinates in one go (OCICollGetElemArray/OCINumberToRealArray not working yet)
+    - set prefetch count
+    - fix support for int keys (numbers with precision 0)
+    - interpret oracle crs without auth_name as EPSG
 
-2010-08-12  mmassing 
+Larry Shaffer 	2013-01-14
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix off-by-one calculation of
-	element sum (raster stats).  git-svn-id: http://svn.osgeo.org/qgis/trunk@14069
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Re-add mysteriously missing connections for custom env variables checkbox
+    
+    - Probably removed during QtDesigner changes to .ui file; code into .cpp file instead
+    - Possible fix for #6961
 
-2010-08-11  jef 
+Hugo Mercier 	2013-01-14
 
-	* src/core/qgspallabeling.cpp: fix r14018 (reenable pal label
-	reprojection) git-svn-id: http://svn.osgeo.org/qgis/trunk@14068
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    refs #6956
+    Fix map frame resizing : do not touch the frame size, adapt the geometry's extent if needed
 
-2010-08-11  timlinux 
+Juergen E. Fischer 	2013-01-14
 
-	* : Interim splash screen for trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@14067
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    oracle provider improvements:
+    - improve srs lookup
+    - insert crs to oracle table on import, if not existent (requires INSERT privilege on MDSYS.SDO_COORD_REF_SYSTEM)
+    - move table lookup into thread
+    - use QgsMessageOutput for import errors (also in postgres and spatialite)
+    - german translation update
 
-2010-08-11  jef 
+Juergen E. Fischer 	2013-01-13
 
-	* src/core/qgsvectorfilewriter.cpp: fix #2933 git-svn-id: http://svn.osgeo.org/qgis/trunk@14066
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] add second browser
 
-2010-08-11  jef 
+Larry Shaffer 	2013-01-13
 
-	* ms-windows/osgeo4w/package.cmd: separate grass plugin package for
-	osgeo4w git-svn-id: http://svn.osgeo.org/qgis/trunk@14065
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add QgisApp::messageTimeout() to iface sip file
+    
+    - [API] Remove recently added, and unnecessary, mMessageTimeout and setMessageTimeout() from QgisApp
 
-2010-08-11  jef 
+Larry Shaffer 	2013-01-13
 
-	* src/app/ogr/qgsogrsublayersdialog.cpp,
-	src/app/ogr/qgsogrsublayersdialog.h, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/ui/qgsogrsublayersdialogbase.ui: apply #1040 git-svn-id: http://svn.osgeo.org/qgis/trunk@14064
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set fixed size for close icon in QgsMessageBar
 
-2010-08-11  jef 
+Larry Shaffer 	2013-01-12
 
-	* src/providers/wfs/qgswfsprovider.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@14063
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Finish refactoring that caused build error
 
-2010-08-11  jef 
+Juergen E. Fischer 	2013-01-13
 
-	* debian/compat.squeeze, debian/control.lenny, debian/control.sid,
-	debian/control.squeeze, debian/rules: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@14062
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build error
 
-2010-08-11  wonder 
+Nathan Woodrow 	2013-01-13
 
-	* python/core/qgsmaplayer.sip, src/core/qgsmaplayer.cpp: Fixed
-	setCacheImage() python binding.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14053
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix build
 
-2010-08-10  timlinux 
+Larry Shaffer 	2013-01-12
 
-	* CODING, doc/CODING.t2t: Tweak to debugging plugins url from Volker git-svn-id: http://svn.osgeo.org/qgis/trunk@14051
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add stop/start and user default option for timeout of timed QgsMessageBars
+    
+    - Add pause/start icons to timeout countdown progress bar
+    - Add user-defined option for general message timeouts
+    - [API] Add get/set methods for general message timeouts to QgisApp
 
-2010-08-10  jef 
+Merge: ac29c5b 5b06de9
+Jürgen Fischer 	2013-01-12
 
-	* i18n/qgis_fr.ts: french translation update from Jean Roc git-svn-id: http://svn.osgeo.org/qgis/trunk@14049
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #378 from slarosa/ftools_split_vector
+    
+    fix #4534
 
-2010-08-10  wonder 
+Juergen E. Fischer 	2013-01-12
 
-	* src/core/raster/qgsrastershader.cpp: Make sure not to delete the
-	shader function if it is the same.  git-svn-id: http://svn.osgeo.org/qgis/trunk@14046
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    prepare-commit.sh: remove trailing blanks from python files
 
-2010-08-10  jef 
+Juergen E. Fischer 	2013-01-12
 
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14045
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-08-10  jef 
+Juergen E. Fischer 	2013-01-12
 
-	* doc/index.html,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doPointDistance.py: fix some typos git-svn-id: http://svn.osgeo.org/qgis/trunk@14044
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    prepare-commit.sh: remove trailing blanks from python files
 
-2010-08-10  jef 
+Juergen E. Fischer 	2013-01-12
 
-	* src/providers/wms/qgswmsprovider.cpp: fix #2934 git-svn-id: http://svn.osgeo.org/qgis/trunk@14043
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix sip binding of QgsCredentials::get() (always returned true; partly rolls back dcf3ede)
 
-2010-08-10  timlinux 
+Merge: 13bfb5e 8203eff
+Larry Shaffer 	2013-01-12
 
-	* python/core/qgsrasterlayer.sip, src/app/legend/qgslegend.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: Fix typo in raster enum for
-	MultiBandsingleBandGray and kept old enum with identical value for
-	backwards compatibility git-svn-id: http://svn.osgeo.org/qgis/trunk@14042
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #385 from slarosa/pyqgis-console
+    
+    remove item QgsInterface from import class menu in python console
 
-2010-08-09  jef 
+Salvatore Larosa 	2013-01-12
 
-	* src/core/qgsvectordataprovider.cpp: add support for non-numeric
-	fields in generic minimumValue/maximumValue fallback method git-svn-id: http://svn.osgeo.org/qgis/trunk@14034
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove item QgsInterface from import class menu in python console
+    since a369ed0 it is no longer necessary to import iface object
 
-2010-08-09  ersts 
+Merge: 5b431df bc4f8f2
+Victor Olaya 	2013-01-12
 
-	* src/app/qgsrasterlayerproperties.cpp: -Fix for bugs introduced by
-	patch attached to ticket #1683 -Closes ticket #2885 git-svn-id: http://svn.osgeo.org/qgis/trunk@14033
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-08-09  ersts 
+Larry Shaffer 	2013-01-12
 
-	* src/core/raster/qgsrasterlayer.cpp: -Added check to make sure
-	preferred bands combinations are valid -Closes ticket #1852 git-svn-id: http://svn.osgeo.org/qgis/trunk@14032
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add convenience methods for pushing a non-widget-based message to QgsMessageBar
+    
+    - Switch some WARNING messages over to INFO
+    - Add default icon for CRITICAL messages
 
-2010-08-09  ersts 
+Nathan Woodrow 	2013-01-12
 
-	* python/core/qgsrasterlayer.sip, src/app/legend/qgslegend.cpp,
-	src/app/legend/qgslegend.h, src/app/legend/qgslegendlayer.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: -Added a new option to the legend
-	menu that will stretch the current layer using the min and max pixel
-	values of the current extent -Added a convenience function
-	QgsRasterLayer::setMinimumMaximumUsingLastExtent that will set the
-	min max of the current band or bands being displayed using the pixel
-	values from the last extent git-svn-id: http://svn.osgeo.org/qgis/trunk@14031
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Import iface into Python console
 
-2010-08-08  jef 
+Larry Shaffer 	2013-01-12
 
-	* src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h,
-	src/providers/wfs/qgswfsdata.h,
-	src/providers/wfs/qgswfsprovider.cpp: fix build with Qt 4.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@14030
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update 'not vector/editable layer' dialogs to message bar for new Rotate map tool
 
-2010-08-08  mhugent 
+Larry Shaffer 	2013-01-12
 
-	* src/providers/wfs/qgswfsprovider.cpp: Avoid filtering of https
-	requests in wfs provider git-svn-id: http://svn.osgeo.org/qgis/trunk@14029
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6957, move 'not vector/editable layer' dialogs to message bar for map edit and select tools
+    
+    - Move notifications to base QgsMapToolEdit class
+    - Add QgsMessageBar::INFO icon (also useful for lightweight WARNING)
 
-2010-08-07  wonder 
+Victor Olaya 	2013-01-12
 
-	* python/core/qgsrastershaderfunction.sip,
-	src/core/raster/qgscolorrampshader.h: Added convenience constructor
-	for color ramp shader git-svn-id: http://svn.osgeo.org/qgis/trunk@14023
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    sextante file dialog now remembers last used folder
 
-2010-08-07  wonder 
+Victor Olaya 	2013-01-12
 
-	* python/core/qgsrasterlayer.sip, python/core/qgsrastershader.sip,
-	python/core/qgsrastershaderfunction.sip,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrastershader.cpp,
-	src/core/raster/qgsrastershader.h: Raster shader fixes: - memory leaks when changing shader functions - PyQGIS: subclassing of raster shader function instances - PyQGIS: transfer ownership of the shader function to c++ git-svn-id: http://svn.osgeo.org/qgis/trunk@14022
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    modified grass postprocessing and edited grass description
 
-2010-08-07  pcav 
+Victor Olaya 	2013-01-12
 
-	* i18n/qgis_it.ts: Typo in IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@14021
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    code cleaning
 
-2010-08-06  brushtyler 
+Victor Olaya 	2013-01-12
 
-	* CONTRIBUTORS, python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/widgetTranslate.ui: Applied patch
-	from #2930: improve GdalTools Translate dialog.  Contributed by
-	Duarte Carreira, thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@14020
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    editing parameters in modeler now remembers previous values
 
-2010-08-06  brushtyler 
+Marco Hugentobler 	2013-01-12
 
-	* python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/tools/dialogBase.ui,
-	python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doPolygonize.py,
-	python/plugins/GdalTools/tools/optionsTable.ui,
-	python/plugins/GdalTools/tools/widgetContour.ui,
-	python/plugins/GdalTools/tools/widgetConvert.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetInfo.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui: aligned to
-	GdalTools v1.2.8 git-svn-id: http://svn.osgeo.org/qgis/trunk@14019
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Transform anchor point if rotating reprojected features
 
-2010-08-06  wonder 
+vinayan 	2013-01-08
 
-	* src/core/qgspallabeling.cpp: new labeling: do not crash on invalid
-	geometries git-svn-id: http://svn.osgeo.org/qgis/trunk@14018
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    moved to Advanced Editing Toolbar
 
-2010-08-06  wonder 
+vinayan 	2013-01-08
 
-	* python/core/qgsrasterlayer.sip,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: Fixed wrappers from
-	QgsRasterLayer::computeMinimumMaximumFromLastExtent,
-	computeMinimumMaximumEstimates git-svn-id: http://svn.osgeo.org/qgis/trunk@14017
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    rotate closest feature if selection is empty
 
-2010-08-06  jef 
+vinayan 	2013-01-06
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp: fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@14016
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    icon added,fixed issue with no selection on
 
-2010-08-05  jef 
+vinayan 	2013-01-06
 
-	* debian/changelog, debian/qgis.install: debian packaging fix git-svn-id: http://svn.osgeo.org/qgis/trunk@14014
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    prepare commit script run
 
-2010-08-05  kyngchaos 
+vinayan 	2013-01-06
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync with r14009 git-svn-id: http://svn.osgeo.org/qgis/trunk@14012
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixed Rotation anchor issue while zooming panning
 
-2010-08-04  jef 
+vinayan 	2013-01-06
 
-	* python/core/qgsattributeaction.sip,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/qgisapp.cpp, src/app/qgsidentifyresults.cpp,
-	src/core/qgsattributeaction.cpp, src/core/qgsattributeaction.h: add
-	QgsAttributeAction::doAction to python bindings git-svn-id: http://svn.osgeo.org/qgis/trunk@14010
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added Rotate Map Tool
 
-2010-08-04  jef 
+Merge: 971c7b8 8803a00
+Larry Shaffer 	2013-01-11
 
-	* src/gui/CMakeLists.txt, src/gui/qgsattributeeditor.cpp,
-	src/gui/qgslonglongvalidator.h: followup r14006: add
-	QgsLongLongValidator git-svn-id: http://svn.osgeo.org/qgis/trunk@14009
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #382 from dakcarto/iface_edits-tool-switch-fix_1
+    
+    Fix #6968, saving/rollbacking edits deselects current editing tool
 
-2010-08-04  mhugent 
+Larry Shaffer 	2013-01-09
 
-	* src/providers/wfs/qgswfsprovider.cpp: Don't add empty attribute
-	fields to the insert statement in wfs-t (some servers complain about
-	it) git-svn-id: http://svn.osgeo.org/qgis/trunk@14007
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6968, saving/rollbacking edits deselects current editing tool
 
-2010-08-04  mhugent 
+Nathan Woodrow 	2013-01-10
 
-	* src/app/qgsattributedialog.cpp, src/gui/qgsattributeeditor.cpp: 
-	Support for long int in attribute dialog and editor. Fixes bug #2928 git-svn-id: http://svn.osgeo.org/qgis/trunk@14006
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add groupbox support to attribute editor
 
-2010-08-03  borysiasty 
+Larry Shaffer 	2013-01-11
 
-	* python/core/qgsrasterdataprovider.sip: fix compiling error git-svn-id: http://svn.osgeo.org/qgis/trunk@14004
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add descriptive names to message bar levels (from Matthais Kuhn)
+    
+    - Enum containing INFO, WARNING and CRITICAL
 
-2010-08-03  jef 
+Juergen E. Fischer 	2013-01-12
 
-	* python/core/qgsrasterdataprovider.sip,
-	src/app/qgswmssourceselect.cpp, src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: show wms get capabilities error git-svn-id: http://svn.osgeo.org/qgis/trunk@14003
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    oracle provider: accept number(0) as key
 
-2010-08-03  jef 
+Merge: 078f0d0 eb02e91
+Marco Hugentobler 	2013-01-11
 
-	* debian/changelog, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.maverick, debian/control.sid: 
-	debian packaging update (fixes #2926) git-svn-id: http://svn.osgeo.org/qgis/trunk@14001
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2010-08-03  kyngchaos 
+Marco Hugentobler 	2013-01-11
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: fix a bundling bug,
-	missed lib subdir in config header git-svn-id: http://svn.osgeo.org/qgis/trunk@14000
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix python zebra style test
 
-2010-08-02  kyngchaos 
+Juergen E. Fischer 	2013-01-11
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig: split bundle step to separate
-	target; misc cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13999
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    oracle provider: fix menu entry
 
-2010-08-02  mhugent 
+Merge: 37f7d57 5003c46
+Jürgen Fischer 	2013-01-10
 
-	* python/core/qgsmaprenderer.sip, src/app/qgslabelinggui.cpp,
-	src/app/qgslabelinggui.h, src/core/qgsmaprenderer.h,
-	src/core/qgspallabeling.cpp, src/core/qgspallabeling.h,
-	src/core/qgsvectorlayer.cpp, src/ui/qgslabelingguibase.ui: 
-	[FEATURE]: data defined font and buffer settings for labeling-ng git-svn-id: http://svn.osgeo.org/qgis/trunk@13998
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #384 from lynxlynxlynx/master
+    
+    Try to find QWT harder
 
-2010-08-02  mhugent 
+Larry Shaffer 	2013-01-10
 
-	* python/core/qgscomposermap.sip, python/core/qgsmaprenderer.sip,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h, src/core/qgsmaprenderer.cpp,
-	src/core/qgsmaprenderer.h: Use floating point numbers for size and
-	dpi. This is necessary to avoid distortions on devices where painter
-	units are not pixels (e.g. graphics scene in print composer) git-svn-id: http://svn.osgeo.org/qgis/trunk@13995
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update QgsMessageBar sip file to include timeout messages
 
-2010-08-01  jef 
+Larry Shaffer 	2013-01-10
 
-	* src/plugins/georeferencer/qgsleastsquares.cpp: fix build error git-svn-id: http://svn.osgeo.org/qgis/trunk@13993
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Switch 'select vector layer first' dialog warning for labeling toolbar action to QgsMessageBar timeout message
 
-2010-08-01  mmassing 
+Larry Shaffer 	2013-01-10
 
-	* src/plugins/georeferencer/qgsleastsquares.cpp: Indentation
-	cleanups, before jef beats me to it :-) git-svn-id: http://svn.osgeo.org/qgis/trunk@13992
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add optional message timeout with countdown progress bar to QgsMessageBar
 
-2010-08-01  mmassing 
+Jaka Kranjc 	2013-01-10
 
-	* src/plugins/georeferencer/qgsgeoreftransform.cpp: Remove debugging
-	output.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13991
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    FindQwt.cmake: also detect qwt6 suffixes
 
-2010-08-01  mmassing 
+Marco Hugentobler 	2013-01-10
 
-	* src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsleastsquares.cpp: Georeferencer:
-	Normalize coordinates in order to improve numerical conditioning of
-	homography estimation.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13990
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix display of paper size after loading from Template. Fixes #6818
 
-2010-08-01  jef 
-
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsleastsquares.cpp: fix warning,
-	indentation and little cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13989
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-08-01  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13988
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 834107a f2a0378
+volaya 	2013-01-10
 
-2010-07-30  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h,
-	src/plugins/georeferencer/qgsleastsquares.cpp,
-	src/plugins/georeferencer/qgsleastsquares.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp: Add
-	support for projective transformations, which can relate perspective
-	images of a plane.  Fits a homography to the GCP using total least squares, which
-	minimizes algebraic error.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13987
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-30  borysiasty 
-
-	* python/console.py: fix #2874 git-svn-id: http://svn.osgeo.org/qgis/trunk@13986
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-30  mhugent 
-
-	* src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.h,
-	src/providers/wfs/qgswfsdata.cpp, src/providers/wfs/qgswfsdata.h,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wfs/qgswfsprovider.h: [FEATURE]: WFS-T support
-	(experimental). Additionally ported wfs to network manager (code
-	from Juergen, patch #2892) git-svn-id: http://svn.osgeo.org/qgis/trunk@13985
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #383 from slarosa/sextante-issue
+    
+    Fix for destination CRS in SEXTANTE GRASS algs:
 
-2010-07-29  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: new north arrows
-	(r13978) git-svn-id: http://svn.osgeo.org/qgis/trunk@13979
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4ddcb3e 2c1db1c
+mhugent 	2013-01-10
 
-2010-07-29  timlinux 
-
-	* images/north_arrows/CMakeLists.txt,
-	images/north_arrows/NorthArrow10.svg,
-	images/north_arrows/NorthArrow11.svg,
-	images/north_arrows/NorthArrow12.svg,
-	images/north_arrows/NorthArrow13.svg,
-	images/north_arrows/NorthArrow14.svg,
-	images/north_arrows/NorthArrow15.svg,
-	images/north_arrows/NorthArrow16.svg,
-	images/north_arrows/NorthArrow_blackgreenblack.svg,
-	images/north_arrows/NorthArrow_blackwhiteblack.svg,
-	images/north_arrows/NorthArrow_blackyellowblack.svg,
-	images/north_arrows/NorthArrow_bluegreenblue.svg,
-	images/north_arrows/NorthArrow_source.svg,
-	images/svg/north_arrows/NorthArrow_blackgreenblack.svg,
-	images/svg/north_arrows/NorthArrow_blackwhiteblack.svg,
-	images/svg/north_arrows/NorthArrow_blackyellowblack.svg,
-	images/svg/north_arrows/NorthArrow_bluegreenblue.svg,
-	images/svg/north_arrows/NorthArrow_source.svg: Tidy up north arrows git-svn-id: http://svn.osgeo.org/qgis/trunk@13978
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-28  mmassing 
-
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix #2449: enables
-	numerical sorting and automatic updates of gcp list.  -Use proxy model to implement dynamic sorting.  -Remove some legacy
-	code.  -Employ user role for correct numerical sorting.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13977
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-27  pcav 
-
-	* i18n/qgis_it.ts, src/plugins/grass/modules-common/v.univar.qgm: 
-	Fixed v.univar GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@13972
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-25  alexbruy 
-
-	* python/plugins/fTools/tools/doMergeShapes.py: allow users to enter
-	path to shapefiles manually in Merge shapefiles tool (apply #2897) git-svn-id: http://svn.osgeo.org/qgis/trunk@13963
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-25  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.h: Patch by Luiz
-	Motta: adds the ability to move GCPs in the qgis canvas (partial
-	commit of #2890). Thanks.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13962
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-25  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix a bug where
-	user was not prompted whether to save or discard modified GCPs.  Prompt-on-exit did not catch the case were only the source, but not
-	the destination coordinates of a GCP were modified.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13961
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-25  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h: Patch by Luiz Motta:
-	re-add georeferenced raster to qgis layers after project reload
-	(partial commit of #2890). Thanks.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13960
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-25  mmassing 
-
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui: Patch
-	by Luiz Motta: Do not translate gdal compression arguments, fixes
-	#2881. Thanks.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13959
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-24  jef 
-
-	* debian/changelog, debian/compat.maverick, debian/control,
-	debian/control.maverick, debian/rules, src/app/qgisapp.cpp,
-	src/app/qgisapp.h: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13958
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-24  brushtyler 
-
-	* src/app/qgisapp.cpp: changed wrong key used retrieving from
-	settings the last used image filter, to fix #2901 git-svn-id: http://svn.osgeo.org/qgis/trunk@13957
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-24  mhugent 
-
-	* src/plugins/wfs/qgswfssourceselect.cpp: Apply patch #2891, WFS
-	exception. Thanks to strk git-svn-id: http://svn.osgeo.org/qgis/trunk@13956
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-24  timlinux 
-
-	* images/north_arrows/CMakeLists.txt,
-	images/north_arrows/NorthArrow10.svg,
-	images/north_arrows/NorthArrow11.svg,
-	images/north_arrows/NorthArrow12.svg,
-	images/north_arrows/NorthArrow13.svg,
-	images/north_arrows/NorthArrow14.svg,
-	images/north_arrows/NorthArrow15.svg,
-	images/north_arrows/NorthArrow16.svg,
-	images/north_arrows/NorthArrow_blackgreenblack.svg,
-	images/north_arrows/NorthArrow_blackwhiteblack.svg,
-	images/north_arrows/NorthArrow_blackyellowblack.svg,
-	images/north_arrows/NorthArrow_bluegreenblue.svg,
-	images/north_arrows/NorthArrow_source.svg: Added north arrows from
-	Nikos Alexandris git-svn-id: http://svn.osgeo.org/qgis/trunk@13955
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-23  rduivenvoorde 
-
-	* python/plugins/mapserver_export/ms_export.py: removed obsolete
-	&SERVICE=WMS from status-message for mode=map url git-svn-id: http://svn.osgeo.org/qgis/trunk@13954
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-23  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync installed headers
-	with cmake lists \(I'll try to stay on top of this in the future\!\) git-svn-id: http://svn.osgeo.org/qgis/trunk@13952
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-21  wonder 
-
-	* python/core/qgsapplication.sip, src/app/main.cpp,
-	src/core/qgsapplication.cpp, src/core/qgsapplication.h: [FEATURE]
-	Added --configpath option that overrides the default path (~/.qgis)
-	for user configuration and forces QSettings to use this directory,
-	too.\ This allows users to e.g. carry QGIS installation on a flash
-	drive together with all plugins and settings.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13951
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-21  wonder 
-
-	* src/core/qgssearchtreenode.cpp: added missing conversions from
-	expression tree nodes to string.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13950
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-21  pcav 
-
-	* DONORS, debian/control: Updated DONORS list git-svn-id: http://svn.osgeo.org/qgis/trunk@13949
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  mhugent 
-
-	* src/plugins/interpolation/qgisinterpolator.h: Remove legacy file
-	from interpolation plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@13948
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
-
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Use size scale
-	also for line symbols to modify line width.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13947
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
-
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.h,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h,
-	src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h,
-	src/gui/symbology-ng/qgsrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrendererv2widget.h,
-	src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h,
-	src/ui/qgscategorizedsymbolrendererv2widget.ui,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui: [FEATURE] Data-defined
-	rotation and size for categorized and graduated renderer
-	(symbology-ng) Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13946
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  mhugent 
-
-	* src/app/qgslabelinggui.cpp, src/core/qgspallabeling.cpp,
-	src/core/qgspallabeling.h, src/ui/qgslabelingguibase.ui: [FEATURE]:
-	multiline labels for labeling-ng git-svn-id: http://svn.osgeo.org/qgis/trunk@13945
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
-
-	* python/core/qgssearchstring.sip, src/core/qgssearchstring.cpp,
-	src/core/qgssearchstring.h: Add a convenience constructor from
-	QString to QgsSearchString git-svn-id: http://svn.osgeo.org/qgis/trunk@13944
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
-
-	* python/utils.py, src/python/qgspythonutilsimpl.cpp,
-	src/python/qgspythonutilsimpl.h: Better handling of python path and
-	plugins paths.  Additionally, plugin paths in QGIS_PLUGINPATH can be
-	separated by either semicolon or colon.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13943
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13942
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
-
-	* python/core/qgssearchtreenode.sip,
-	src/app/qgsfieldcalculator.cpp, src/app/qgsfieldcalculator.h,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h, src/ui/qgsfieldcalculatorbase.ui: 
-	Added "$rownum" token to syntax of expressions. In field calculator
-	it can be used for counting rows. The counter starts from 1. Outside
-	field calculator it returns always zero.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13941
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-07-20  wonder 
+    Merge pull request #380 from bischofia/updateFieldName
+    
+    update field names when vector layer properties are applied
 
-	* python/core/qgssearchtreenode.sip,
-	src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: Support string concatenation using the
-	standard sql concatenation operator || Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA].  For the project: "Sviluppo di prodotti
-	software GIS open-source basati sui prodotti QuantumGIS e Postgis
-	(CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13940
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2013-01-10
 
-2010-07-19  gjm 
+    Fix for destination CRS in GRASS algs:
+    Refs: http://lists.osgeo.org/pipermail/qgis-user/2013-January/020847.html
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: Fix bug #2772 (dropping
-	gpx files onto qgis didn't open the file correctly).  git-svn-id: http://svn.osgeo.org/qgis/trunk@13939
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-09
 
-2010-07-19  mhugent 
+    Add support for QCalendarWidget in custom forms
 
-	* src/app/composer/qgscomposerlabelwidget.cpp,
-	src/app/composer/qgscomposerlabelwidget.h,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposerlabel.cpp,
-	src/core/composer/qgscomposerlabel.h,
-	src/ui/qgscomposerlabelwidgetbase.ui: Apply patch #2868 (adds label
-	alignment) with modifications. Thanks medspx git-svn-id: http://svn.osgeo.org/qgis/trunk@13938
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-10
 
-2010-07-19  jef 
+    re-enable QGisApp::updateLayerModifiedActions()
 
-	* python/plugins/mapserver_export/ms_export.py: fix #2894 git-svn-id: http://svn.osgeo.org/qgis/trunk@13937
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-01-10
 
-2010-07-19  borysiasty 
+    translation update: gl_ES by Xan
 
-	* i18n/qgis_pl_PL.ts, src/ui/qgsnewhttpconnectionbase.ui: gui string
-	fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13936
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-19  mhugent 
+    fix crash on CRS validation
 
-	* src/plugins/wfs/qgswfssourceselect.cpp: Apply patch in ticket
-	#2891 and some more verbose error reporting. Thanks strk git-svn-id: http://svn.osgeo.org/qgis/trunk@13935
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-18  gjm 
+    fix some warnings and myriads of global QString objects
 
-	* src/app/qgisapp.cpp: Implement suggestion in #2882 (make the Mac
-	build use the configurable directory for the lib install directory -
-	rather than the hard-coded 'lib').  git-svn-id: http://svn.osgeo.org/qgis/trunk@13930
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-18  gjm 
+    oracle provider: fix connection settings
 
-	* CMakeLists.txt, cmake/FindGRASS.cmake, cmake/FindQWT.cmake: Apply
-	patches in #2863 (configuration changes to make ccmake work with
-	less manual configuration).  git-svn-id: http://svn.osgeo.org/qgis/trunk@13928
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-17  kyngchaos 
+    osgeo4w: change geos_c_i to geos_c
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: version bump (r13926); context
-	help update (r13924); fix path to user bundle script git-svn-id: http://svn.osgeo.org/qgis/trunk@13927
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-17  jef 
+    german translation update
 
-	* CMakeLists.txt: update trunk version git-svn-id: http://svn.osgeo.org/qgis/trunk@13926
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-09
 
-2010-07-17  borysiasty 
+    [FEATURE] add oracle provider
 
-	* resources/context_help/QgsAttributeTableDialog-pl_PL,
-	resources/context_help/QgsWMSSourceSelect-pl_PL: context help pl
-	update by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13924
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Minoru Akagi 	2012-12-07
 
-2010-07-17  jef 
+    update field names when vector layer properties are applied
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13923
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-08
 
-2010-07-17  jef 
+    improvements for handling tables
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: apply #2730 git-svn-id: http://svn.osgeo.org/qgis/trunk@13922
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 964e842 45fab4b
+Victor Olaya 	2013-01-08
 
-2010-07-17  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* python/gui/qgisinterface.sip, src/app/main.cpp,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgisappinterface.cpp, src/gui/qgisinterface.h: apply #2791 git-svn-id: http://svn.osgeo.org/qgis/trunk@13921
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2013-01-08
 
-2010-07-17  jef 
+    fix #4534
 
-	* src/app/composer/qgscomposer.cpp: apply #2858 git-svn-id: http://svn.osgeo.org/qgis/trunk@13920
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e59de66 7e29d7c
+Victor Olaya 	2013-01-07
 
-2010-07-17  timlinux 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* : Updated web banner images - version is 1.5 - thanks Milena :-) git-svn-id: http://svn.osgeo.org/qgis/trunk@13918
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-07
 
-2010-07-17  timlinux 
+    Fixed closing of feature iterators
 
-	* : Updated web banner images git-svn-id: http://svn.osgeo.org/qgis/trunk@13917
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2013-01-06
 
-2010-07-14  macho 
+    Postgres feature iterator fixes (rewind, FID filter, closing)
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13916
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a785fd5 522bbcd
+Victor Olaya 	2013-01-04
 
-2010-07-14  cfarmer 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* python/plugins/fTools/tools/doSelectByLocation.py: Select by
-	location now works on full layer extent. Fixes #2210.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13915
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5c00014 a572f3c
+Victor Olaya 	2013-01-04
 
-2010-07-13  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* src/plugins/ogr_converter/plugin.cpp: fix OGR converter menu
-	removal git-svn-id: http://svn.osgeo.org/qgis/trunk@13914
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-01
 
-2010-07-12  jef 
+    edited grass and saga algorithm descriptions
 
-	* ms-windows/osgeo4w/package.cmd, ms-windows/osgeo4w/qgis.bat.tmpl: 
-	update osgeo4w build to use GDAL 1.7 git-svn-id: http://svn.osgeo.org/qgis/trunk@13913
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2013-01-01
 
-2010-07-12  gjm 
+    refactor fTools algorithms
 
-	* cmake_templates/qgsconfig.h.in, src/app/qgisapp.cpp: Fix ticket
-	#2882 (not using QGIS_LIB_SUBDIR to determine pathname to the qgis
-	library directory for linux builds) git-svn-id: http://svn.osgeo.org/qgis/trunk@13912
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-29
 
-2010-07-12  borysiasty 
+    Fixing support for spatialite 4.0
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13911
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-28
 
-2010-07-11  borysiasty 
+    Faster initialization of attributes
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13910
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-28
 
-2010-07-11  jef 
+    Slightly faster preparation of vectors of points
 
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13909
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-27
 
-2010-07-11  macho 
+    Disable scale field if no symbology export
 
-	* i18n/qgis_th.ts: translation update: th by Man git-svn-id: http://svn.osgeo.org/qgis/trunk@13908
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-27
 
-2010-07-11  mhugent 
+    Export ogr feature style in mm for line width and in ground units for line pattern
 
-	* src/plugins/wfs/qgswfssourceselect.cpp: Improvement to fix for
-	2878 git-svn-id: http://svn.osgeo.org/qgis/trunk@13907
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-26
 
-2010-07-11  mhugent 
+    Let ogr give ids to created features (otherwise, there are problems with exported dxf files)
 
-	* src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.h: Remember last wfs connection
-	in dialog (ticket #2878) git-svn-id: http://svn.osgeo.org/qgis/trunk@13906
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-25
 
-2010-07-11  borysiasty 
+    Ogr style string for line pattern fill
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13905
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-25
 
-2010-07-11  mhugent 
+    Write offset into ogr pen style
 
-	* src/app/legend/qgslegendlayer.cpp, src/app/qgsoptions.cpp,
-	src/ui/qgsoptionsbase.ui: Option for raster icon in legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13904
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-25
 
-2010-07-09  jef 
+    Write pen cap and join style to ogr pen
 
-	* src/app/composer/qgscomposer.cpp: fix #2879 git-svn-id: http://svn.osgeo.org/qgis/trunk@13903
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-25
 
-2010-07-08  mhugent 
+    Add custom dash dot pattern to symbol layer utils function
 
-	* src/app/legend/qgslegendlayer.cpp: Disable raster legend icon for
-	release because of performance problems git-svn-id: http://svn.osgeo.org/qgis/trunk@13899
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-23
 
-2010-07-08  macho 
+    Fetch attributes for symbology export
 
-	* i18n/qgis_ja.ts: translation update: ja by yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13898
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-23
 
-2010-07-06  borysiasty 
+    Feature style for simple fill
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13895
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-23
 
-2010-07-06  rduivenvoorde 
+    Use start / stopRender for renderer in vector symbology export
 
-	* python/plugins/mapserver_export/ms_export.py: fix for #2848:
-	exported style better in line with qgis style git-svn-id: http://svn.osgeo.org/qgis/trunk@13894
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-21
 
-2010-07-06  jef 
+    Dash dot pattern
 
-	* src/core/qgsvectorlayer.cpp, src/core/qgsvectoroverlay.h,
-	src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp: fix
-	#2869 git-svn-id: http://svn.osgeo.org/qgis/trunk@13893
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-21
 
-2010-07-06  macho 
+    Use scale for symbology export (if symbol measures are defined in map units)
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: the "are we really in string freeze" commit ;) git-svn-id: http://svn.osgeo.org/qgis/trunk@13892
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-20
 
-2010-07-06  borysiasty 
+    Re-enabled GPX provider
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13891
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-20
 
-2010-07-05  jef 
+    Fixed isModified()
 
-	* src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp: fix
-	#2864 git-svn-id: http://svn.osgeo.org/qgis/trunk@13890
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-20
 
-2010-07-05  mhugent 
+    Hack to fix line widths (for dxf only?)
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix crash if raster width is
-	below 1 pixels (ticket #2846) git-svn-id: http://svn.osgeo.org/qgis/trunk@13889
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-19
 
-2010-07-05  jef 
+    Checking of invalid values when calling edit buffer operations
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13888
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-19
 
-2010-07-04  gjm 
+    Changed data structure for added features from list to map to allow efficient lookups
 
-	* src/app/qgsvectorlayerproperties.cpp: Fix for #2820, layer extents
-	use scientific notation for large numbers when it would be better to
-	stick with non-scientific notation git-svn-id: http://svn.osgeo.org/qgis/trunk@13887
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-18
 
-2010-07-04  gjm 
+    ogr feature style for simple marker
 
-	* src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/gps_importer/qgsgpsplugingui.cpp,
-	src/plugins/gps_importer/qgsgpsplugingui.h: Fix for ticket #2228.
-	Also enhanced to offer a couple more conversion options between
-	tracks, waypoints, and routes.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13886
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-18
 
-2010-07-04  cfarmer 
+    Add coordinate transform to symbol layer vector export
 
-	* python/plugins/fTools/tools/doSubsetSelect.py: Patch to fix
-	(second problem) #2735. Patch thanks to brushtyler.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13885
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-18
 
-2010-07-04  gjm 
+    Better error handling
 
-	* src/app/qgisapp.cpp: When qgis is installed in a non-standard
-	place, qgis doesn't find the python plugin library. This may help
-	resolve #2618.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13884
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 81b0930 122cff7
+Martin Dobias 	2012-12-18
 
-2010-07-04  wonder 
+    Merge remote-tracking branch 'origin/master' into new_vector_api
+    
+    Also disabled mapserver until compilation is fixed.
+    Fixed tests.
+    
+    Conflicts:
+src/app/legend/qgslegendlayer.cpp           
+src/app/qgsattributedialog.cpp           
+src/app/qgsattributedialog.h           
+src/app/qgslabelpropertydialog.cpp           
+src/app/qgsmaptoollabel.cpp           
+src/app/qgsvectorlayerproperties.cpp           
+src/core/CMakeLists.txt           
+src/core/composer/qgsatlascomposition.cpp           
+src/core/qgsexpression.cpp           
+src/core/qgspallabeling.cpp           
+src/core/qgsvectorlayer.cpp           
+src/core/qgsvectorlayer.h           
+src/core/qgsvectorlayerimport.cpp           
+src/mapserver/qgsprojectparser.cpp           
+src/mapserver/qgswfsserver.cpp           
+src/mapserver/qgswfsserver.h           
+src/mapserver/qgswmsserver.cpp           
+src/providers/postgres/qgspostgresprovider.cpp           
+src/providers/spatialite/qgsspatialiteprovider.h           
+tests/src/core/testqgsexpression.cpp           
+tests/src/python/test_qgsmemoryprovider.py           
 
-	* src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp: Fix
-	#2862 git-svn-id: http://svn.osgeo.org/qgis/trunk@13883
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-12-17
 
-2010-07-04  gjm 
+    QgsVectorLayer: large internal refactoring
+    
+    Most important changes:
+    - introduced feature iterator for QgsVectorLayer
+    - vector editing moved to QgsVectorEditBuffer
+    - complete rework of undo/redo commands for vector layers
+    - geometry cache separated from editing (QgsVectorLayerCache)
+    - non-essential editing functionality moved to QgsVectorLayerEditUtils
 
-	* AUTHORS: Update my email address git-svn-id: http://svn.osgeo.org/qgis/trunk@13882
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-17
 
-2010-07-02  kyngchaos 
+    Fix width of simple line style
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: fix qgis.g.browser linking git-svn-id: http://svn.osgeo.org/qgis/trunk@13880
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-17
 
-2010-07-02  jef 
+    Possibility of choosing symbology export method in export dialog
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13879
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-13
 
-2010-07-02  kyngchaos 
+    Add enum to vector file writer describing the type of symbology export
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help updates
-	(r13848, r13877) git-svn-id: http://svn.osgeo.org/qgis/trunk@13878
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-07
 
-2010-07-02  jef 
+    Implement ogr style in simple line symbol layer
 
-	* resources/context_help/eVisDatabaseConnectionGui-pf_BR,
-	resources/context_help/eVisDatabaseConnectionGui-pt_BR: fix context
-	help file name git-svn-id: http://svn.osgeo.org/qgis/trunk@13877
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-07
 
-2010-07-02  jef 
+    [FEATURE]: add base mechanisms for OGR feature style export
 
-	* python/plugins/fTools/tools/frmRegPoints.ui: new fix for #2836 git-svn-id: http://svn.osgeo.org/qgis/trunk@13876
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Chris Crook 	2012-11-03
 
-2010-07-02  jef 
+    Code for delimited text provider
 
-	* python/plugins/fTools/tools/frmRegPoints.ui: revert r13855 git-svn-id: http://svn.osgeo.org/qgis/trunk@13875
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e0f9d53 a9ff3cf
+ddehaan 	2012-10-28
 
-2010-07-02  pcav 
+    Merge remote-tracking branch 'origin/master'
 
-	* i18n/qgis_it.ts: Last minute fixes for IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13874
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2013-01-08
 
-2010-07-02  macho 
+    Quality topology layer names
+    
+    ... so you can recognize them in the snapping option dialog
 
-	* i18n/qgis_de.ts, i18n/qgis_ru.ts: translation updates: de and ru
-	last minute fixes ;) git-svn-id: http://svn.osgeo.org/qgis/trunk@13870
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-08
 
-2010-07-02  macho 
+    Rename Query/Build Query to Filter/Set Filter to better reflect action
 
-	* i18n/qgis_ru.ts: translation update: ru by artem git-svn-id: http://svn.osgeo.org/qgis/trunk@13869
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-08
 
-2010-07-01  macho 
+    Fix loading of Python Init method with unsaved features
 
-	* i18n/qgis_ja.ts: translation update: ja by yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13867
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2013-01-08
 
-2010-07-01  jef 
+    translation update: galician by Xan
 
-	* src/plugins/ogr_converter/translator.cpp: fix layer creation in
-	ogr converter plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@13866
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-08
 
-2010-07-01  borysiasty 
+    fix syntax error
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13865
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2013-01-08
 
-2010-07-01  jef 
+    [API] Add method to QgsMapLayerRegistry to get layers using name
 
-	* src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptoolcapture.cpp: 
-	workaround for #2853 git-svn-id: http://svn.osgeo.org/qgis/trunk@13864
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 4ff5b29 c4115cf
+Nathan Woodrow 	2013-01-07
 
-2010-07-01  macho 
+    Merge pull request #377 from matthias-kuhn/attredit-load-idx
+    
+    Fix issue 6899: Drag and drop designer uses first field after project re...
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: string freeze update ;) git-svn-id: http://svn.osgeo.org/qgis/trunk@13863
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-06
 
-2010-07-01  macho 
+    Update Options dialog vertical tabs
+    
+    - Icon-only mode now only shows vert. scrollbar as needed
+    - Icon-only mode is snapped to when splitter is near icons
+    - Splitter is adjusted for vert. scrollbar width, keeping it from covering icon-only mode icons
+    - Remove size grip for dialog
 
-	* i18n/qgis_th.ts: translation update: th by man git-svn-id: http://svn.osgeo.org/qgis/trunk@13862
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-07
 
-2010-06-30  cfarmer 
+    Include project home in browser toplevel browser (implement #6955)
+    [API] add QgsProject::homePath()
+    [API] make QgsBrowserModel::reload() a public slot
 
-	* python/plugins/fTools/tools/doRandPoints.py: patch to fix
-	additional problem with #2430 thanks to brushtyler git-svn-id: http://svn.osgeo.org/qgis/trunk@13861
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-01-07
 
-2010-06-30  cfarmer 
+    Show scroll bars for drag and drop attribute editor if necessary
 
-	* python/plugins/fTools/tools/doRandPoints.py: fixes #2430 and
-	speeds up random point generation on top of vectors significantly git-svn-id: http://svn.osgeo.org/qgis/trunk@13860
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2013-01-07
 
-2010-06-30  cfarmer 
+    Fix issue 6899: Drag and drop designer uses first field after project reload
+    idx was not properly initialized at project load.
 
-	* python/plugins/fTools/tools/doRandom.py: patch from alex to fix
-	#2735 git-svn-id: http://svn.osgeo.org/qgis/trunk@13859
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-07
 
-2010-06-30  macho 
+    fix windows build
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13858
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-07
 
-2010-06-30  jef 
+    - [API] add optional progress dialog to QgsVectorLayerImport
+    - postgres/mssql: fix primary key generation on import (fixes #6907)
+    - fix crash on browser refresh after vector layer import
 
-	* src/app/qgsuniquevaluedialog.cpp: apply #2784 git-svn-id: http://svn.osgeo.org/qgis/trunk@13857
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-06
 
-2010-06-30  jef 
+    german translation update
 
-	* CONTRIBUTORS, src/app/qgslabeldialog.cpp: apply #2824 from Florian
-	Hof git-svn-id: http://svn.osgeo.org/qgis/trunk@13856
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2013-01-06
 
-2010-06-30  jef 
+    doxygen warnings fixes
 
-	* python/plugins/fTools/tools/frmRegPoints.ui: fix #2836 git-svn-id: http://svn.osgeo.org/qgis/trunk@13855
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-06
 
-2010-06-30  jef 
+    fix #6726
 
-	* python/plugins/fTools/tools/doVisual.py: fix #2844 git-svn-id: http://svn.osgeo.org/qgis/trunk@13854
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-06
 
-2010-06-30  jef 
+    attribute table: NULL values are considered less than other values (fixes #6715)
 
-	* src/app/qgisapp.cpp: fix #2852 git-svn-id: http://svn.osgeo.org/qgis/trunk@13853
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-06
 
-2010-06-30  macho 
+    Switch main Options dialog to vertical tabs
+    
+    - Icon-only mode enabled by fully moving splitter to left
 
-	* i18n/qgis_fi.ts: translation update: fi my marko git-svn-id: http://svn.osgeo.org/qgis/trunk@13852
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2a002c5 0595f74
+Larry Shaffer 	2013-01-06
 
-2010-06-30  jef 
+    Merge pull request #372 from dakcarto/iface_enviro_3
+    
+    [FEATURE] Configure custom environment variables
 
-	* i18n/qgis_de.ts, src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptooladdisland.cpp,
-	src/app/qgsmaptooladdring.cpp, src/app/qgsmaptoolmovefeature.cpp,
-	src/app/qgsmaptoolreshape.cpp, src/app/qgsmaptoolsplitfeatures.cpp,
-	src/gui/qgsmapcanvas.cpp: fix #2849 git-svn-id: http://svn.osgeo.org/qgis/trunk@13851
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-06
 
-2010-06-30  mhugent 
+    [API] make primary key field indexes available:
+    - add QgsVectorLayer::pendingPkAttributeList()
+    - add QgsVectorDataProvider::pkAttributeIndexes()
+    - skip primary key attribute when pasting features (fixes #6164)
+    - default to skip primary key attribute in when merging features/attributes
+    - reset primary key attributes to default value when splitting features (better fix for #6060)
+    - comment out unused QgsPasteTransformations
 
-	* src/app/ogr/qgsvectorlayersaveasdialog.cpp: Fix initialisation of
-	format combo box (mainly important for kml layers) git-svn-id: http://svn.osgeo.org/qgis/trunk@13850
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: b2932de 3f5f706
+Jürgen Fischer 	2013-01-04
 
-2010-06-30  jef 
+    Merge pull request #364 from matthias-kuhn/attredit-aliases
+    
+    Attredit aliases
 
-	* src/providers/wms/qgswmsprovider.cpp: fix #2674 git-svn-id: http://svn.osgeo.org/qgis/trunk@13849
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2013-01-04
 
-2010-06-30  macho 
+    Add checkbox to filter non-QGIS-specific vars from current env vars table
 
-	* i18n/qgis_pt_BR.ts, i18n/qgis_ru.ts,
-	resources/context_help/MapServerExport-pt_BR,
-	resources/context_help/QgsBookmarks-pt_BR,
-	resources/context_help/QgsCopyrightLabelPluginGui-pt_BR,
-	resources/context_help/QgsCustomProjectionDialog-pt_BR,
-	resources/context_help/QgsDelimitedTextPluginGui-pt_BR,
-	resources/context_help/QgsGPSPluginGui-pt_BR,
-	resources/context_help/QgsNewOgrConnection-pt_BR,
-	resources/context_help/QgsNewSpatialiteLayerDialog-pt_BR,
-	resources/context_help/QgsNewVectorLayerDialog-pt_BR,
-	resources/context_help/QgsNorthArrowPluginGui-pt_BR,
-	resources/context_help/QgsOpenVectorLayerDialog-pt_BR,
-	resources/context_help/QgsOptions-pt_BR,
-	resources/context_help/QgsPgSourceSelect-pt_BR,
-	resources/context_help/QgsPluginInstallerDialog-pt_BR,
-	resources/context_help/QgsProjectProperties-pt_BR,
-	resources/context_help/QgsScaleBarPluginGui-pt_BR,
-	resources/context_help/QgsSpatiaLiteSourceSelect-pt_BR,
-	resources/context_help/QgsStyleV2ManagerDialog-pt_BR,
-	resources/context_help/QgsVectorLayerProperties-pt_BR,
-	resources/context_help/QgsWMSSourceSelect-pt_BR,
-	resources/context_help/eVisDatabaseConnectionGui-pf_BR: translation
-	updates: ru by artem, pt_BR (with context help) by arthur git-svn-id: http://svn.osgeo.org/qgis/trunk@13848
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-30  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13847
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-30  jef 
-
-	* python/plugins/fTools/tools/doVisual.py: fix for #2833 and #2843 git-svn-id: http://svn.osgeo.org/qgis/trunk@13846
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-29  borysiasty 
-
-	* python/plugins/plugin_installer/installer_gui.py: Plugin Installer
-	minor fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13845
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-29  rduivenvoorde 
-
-	* python/plugins/mapserver_export/ms_export.py: fix for #2847 layers
-	with identical names have problems with data/filter statements git-svn-id: http://svn.osgeo.org/qgis/trunk@13844
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-29  jef 
-
-	* src/app/qgsattributedialog.cpp, src/app/qgsattributedialog.h,
-	src/python/qgspythonutilsimpl.cpp: fix python feature form
-	identifier in case of non-ascii layer ids git-svn-id: http://svn.osgeo.org/qgis/trunk@13842
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-29  jef 
-
-	* resources/context_help/MapServerExport-en_US,
-	resources/context_help/QgsAttributeTableDialog-de_DE,
-	resources/context_help/QgsAttributeTableDialog-en_US,
-	resources/context_help/QgsBookmarks-de_DE,
-	resources/context_help/QgsComposer-de_DE,
-	resources/context_help/QgsCustomProjectionDialog-de_DE,
-	resources/context_help/QgsIdentifyResults-de_DE,
-	resources/context_help/QgsIdentifyResults-en_US,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewSpatialiteLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOpenVectorLayerDialog-en_US,
-	resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsPgSourceSelect-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-en_US,
-	resources/context_help/QgsProjectProperties-de_DE,
-	resources/context_help/QgsProjectProperties-en_US,
-	resources/context_help/QgsScaleBarPluginGui-de_DE,
-	resources/context_help/QgsScaleBarPluginGui-en_US,
-	resources/context_help/QgsVectorLayerProperties-de_DE,
-	resources/context_help/QgsVectorLayerProperties-en_US: context help
-	fix: newlines are no blanks git-svn-id: http://svn.osgeo.org/qgis/trunk@13838
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  macho 
-
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@13837
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  jef 
-
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsAttributeTableDialog-en_US: german
-	translation update and a context help fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13836
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  jef 
-
-	* i18n/qgis_de.ts, resources/context_help/MapServerExport-en_US,
-	resources/context_help/QgsAttributeTableDialog-de_DE,
-	resources/context_help/QgsAttributeTableDialog-en_US,
-	resources/context_help/QgsBookmarks-de_DE,
-	resources/context_help/QgsBookmarks-en_US,
-	resources/context_help/QgsComposer-de_DE,
-	resources/context_help/QgsComposer-en_US,
-	resources/context_help/QgsCopyrightLabelPluginGui-en_US,
-	resources/context_help/QgsCustomProjectionDialog-de_DE,
-	resources/context_help/QgsDelimitedTextPluginGui-de_DE,
-	resources/context_help/QgsIdentifyResults-de_DE,
-	resources/context_help/QgsIdentifyResults-en_US,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewSpatialiteLayerDialog-de_DE,
-	resources/context_help/QgsNewSpatialiteLayerDialog-en_US,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOpenVectorLayerDialog-en_US,
-	resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsPgSourceSelect-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-en_US,
-	resources/context_help/QgsProjectProperties-de_DE,
-	resources/context_help/QgsProjectProperties-en_US,
-	resources/context_help/QgsScaleBarPluginGui-de_DE,
-	resources/context_help/QgsScaleBarPluginGui-en_US,
-	resources/context_help/QgsSpatiaLiteSourceSelect-en_US,
-	resources/context_help/QgsVectorLayerProperties-de_DE,
-	resources/context_help/QgsVectorLayerProperties-en_US,
-	resources/context_help/QgsWMSSourceSelect-de_DE,
-	resources/context_help/QgsWMSSourceSelect-en_US: context help typo
-	fixes, german context help additions and german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13835
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13834
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@13833
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-28  borysiasty 
-
-	* python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py: Plugin
-	installer update: r13830 follow-up git-svn-id: http://svn.osgeo.org/qgis/trunk@13832
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2013-01-05
 
-2010-06-28  macho 
-
-	* i18n/qgis_ca_ES.ts, i18n/qgis_cs_CZ.ts: translation update:
-	catalan by xavi and czech by jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13831
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-06-28  borysiasty 
+Juergen E. Fischer 	2013-01-05
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py,
-	python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui: 
-	Plugin installer fixes: fix error when uninstalling installer
-	itself, support for  repo tag, remove my repository git-svn-id: http://svn.osgeo.org/qgis/trunk@13830
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsVectorLayer: delete before adding/changing features (fixes #6422)
 
-2010-06-28  borysiasty 
+Juergen E. Fischer 	2013-01-04
 
-	* resources/context_help/QgsAttributeTableDialog-en_US,
-	resources/context_help/QgsIdentifyResults-en_US,
-	resources/context_help/QgsOpenVectorLayerDialog-en_US: context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13829
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update INSTALL
 
-2010-06-28  borysiasty 
+Juergen E. Fischer 	2013-01-04
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13828
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wfs in core needs expat
 
-2010-06-28  borysiasty 
+Juergen E. Fischer 	2013-01-04
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13827
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more API updates to the python plugins
 
-2010-06-28  borysiasty 
+Radim Blazek 	2013-01-04
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13826
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    multipart reply extracted from WCS provider QgsNetworkReplyParser
 
-2010-06-28  jef 
+Radim Blazek 	2013-01-04
 
-	* i18n/qgis_de.ts, src/core/raster/qgsrasterlayer.cpp: add a
-	translation string git-svn-id: http://svn.osgeo.org/qgis/trunk@13825
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsWFSData CORE_EXPORT
 
-2010-06-28  borysiasty 
+Radim Blazek 	2013-01-04
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13824
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsWFSData moved to core
 
-2010-06-28  macho 
+Larry Shaffer 	2013-01-03
 
-	* i18n/qgis_lv.ts: translation update: lv by Maris git-svn-id: http://svn.osgeo.org/qgis/trunk@13823
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6940, error traceback output to console crashes under QScintilla 2.7
 
-2010-06-28  borysiasty 
+Marco Hugentobler 	2013-01-04
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13822
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Test WFS version and throw error if 1.0 is not supported by the server
 
-2010-06-28  borysiasty 
+Larry Shaffer 	2013-01-01
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@13821
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Configure custom environment variables
+    
+    - Fix for #3097
+    - Could help plugins, like SEXTANTE, work better across platforms via abstracted coding based upon env vars
+    - In app prefs, configure variables and view current set, with tooltips to show pre-startup value (if any)
 
-2010-06-28  macho 
+Matthias Kuhn 	2012-12-21
 
-	* i18n/qgis_cs_CZ.ts: translation update: CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13820
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Save/Load attribute editor layout for layers without geometry
 
-2010-06-28  macho 
+Matthias Kuhn 	2012-12-21
 
-	* i18n/qgis_zh_TW.ts: translation update: zh_TW by nungyao git-svn-id: http://svn.osgeo.org/qgis/trunk@13819
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Show field alias in drag and drop designer dialogs
 
-2010-06-27  macho 
+ddehaan 	2012-10-28
 
-	* i18n/qgis_bg.ts, i18n/qgis_es.ts: translation update: bg and es by
-	zahari and carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13818
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix int/integer datatype confusion in primary key identification for the sqlanywhere provider
 
-2010-06-27  jef 
+Werner Macho 	2013-01-04
 
-	* src/app/qgisapp.cpp: fix crash on layerless OGR data sources git-svn-id: http://svn.osgeo.org/qgis/trunk@13817
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: lao by Lao GIS users
 
-2010-06-27  macho 
+Juergen E. Fischer 	2013-01-04
 
-	* i18n/qgis_tr.ts: translation update: tr by Osman git-svn-id: http://svn.osgeo.org/qgis/trunk@13816
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    nmea parsing: call strtod with locale "C" (fixes #6687)
 
-2010-06-27  macho 
+Merge: 3359870 fb763a7
+Marco Hugentobler 	2013-01-04
 
-	* i18n/qt_ru.ts: translation update: small qt_ru changes by Artem git-svn-id: http://svn.osgeo.org/qgis/trunk@13815
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2010-06-27  kyngchaos 
+Marco Hugentobler 	2013-01-04
 
-	* mac/xcode/Info.plist, mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: separate libexec subdir (r13792);
-	set SVN version dynamically in Info.plist git-svn-id: http://svn.osgeo.org/qgis/trunk@13814
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Saver double comparison, minor code cleanup (deleting a 0 pointer is always save)
 
-2010-06-27  kyngchaos 
+Larry Shaffer 	2012-12-09
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help update
-	(r13806) git-svn-id: http://svn.osgeo.org/qgis/trunk@13813
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Draw SVG symbol from cached QImage unless it exceeds half of cache size, then use QPicture
+    
+    - Fix #6855, SVG markers/fills larger than half cache (559^2 X 32 + SVG) are drawn with QPicture
+    - Fix #6861, make QPicture SVG symbols scale with Composer page zoom
+    - Fix #6861, make SVG symbol output to print/image more accurate by setting 'size' to double
+    - Update/add support for non-squared SVG via QImage and QPicture, on screen and in output to print/image
+    - Non-squared SVG QImage/QPicture can now be used in pattern fill, without excess space
 
-2010-06-27  borysiasty 
+Merge: 1bda31d fb26989
+Nathan Woodrow 	2013-01-03
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@13812
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #374 from bholland/master
+    
+    Fix #6942
 
-2010-06-26  macho 
+ben 	2013-01-03
 
-	* i18n/qgis_ru.ts: translation update: ru by artem git-svn-id: http://svn.osgeo.org/qgis/trunk@13811
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Bounding box now takes into account font descent so letters like g and j are not cut off from the legend title.
 
-2010-06-26  jef 
+Juergen E. Fischer 	2013-01-04
 
-	* src/app/qgisapp.cpp: fix r13808 git-svn-id: http://svn.osgeo.org/qgis/trunk@13810
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fTools: replace QgsRectangle.expand with .scale
 
-2010-06-26  jef 
+Juergen E. Fischer 	2013-01-04
 
-	* i18n/qgis_de.ts: german translation fixed git-svn-id: http://svn.osgeo.org/qgis/trunk@13809
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6926
 
-2010-06-26  jef 
+Juergen E. Fischer 	2013-01-03
 
-	* src/app/qgisapp.cpp: fix #2819 git-svn-id: http://svn.osgeo.org/qgis/trunk@13808
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    python plugins: replace QgsMapRenderer.destinationSrs() with destinationCrs() (closes #6391)
 
-2010-06-26  macho 
+Merge: d4ef4fd d6a33f5
+Werner Macho 	2013-01-03
 
-	* resources/context_help/QgsDelimitedTextPluginGui-fr_FR,
-	resources/context_help/QgsIdentifyResults-fr_FR: translatex context
-	help by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13806
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #373 from slarosa/pyqgis_console_1
+    
+    Reorganize icons theme for pyqgis console
 
-2010-06-26  mhugent 
+Merge: b48ae8b 77d48a0
+Werner Macho 	2013-01-03
 
-	* src/providers/wms/qgswmsprovider.cpp: Clear crs list after parsing
-	a toplevel layer git-svn-id: http://svn.osgeo.org/qgis/trunk@13805
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #347 from slarosa/pyqgis-console
+    
+    fix output directory for pyqgis console on installing
 
-2010-06-26  borysiasty 
+Merge: 71580df 90ef576
+Werner Macho 	2013-01-03
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@13804
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #370 from slarosa/osm_plugin_issue
+    
+    fixes issues for OSM plugin generated from api cleanup commit
 
-2010-06-24  macho 
+Merge: 93e0526 aef3f34
+Werner Macho 	2013-01-03
 
-	* i18n/qgis_ja.ts: translation update: ja by yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13803
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #371 from bstroebl/fix#6925
+    
+    fix #6925 fTools eliminate now works if the polygon to merge with has an id of 0
 
-2010-06-24  macho 
+Radim Blazek 	2013-01-03
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13802
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    wcs test fix
 
-2010-06-24  rduivenvoorde 
+Juergen E. Fischer 	2013-01-03
 
-	* i18n/qgis_nl.ts: update_ts file for nl needed for Raymond git-svn-id: http://svn.osgeo.org/qgis/trunk@13801
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use project projections instead of WGS84 for WMS crs preselection (fixes #6939)
 
-2010-06-24  rduivenvoorde 
+Radim Blazek 	2013-01-03
 
-	* i18n/qgis_nl.ts: update nl git-svn-id: http://svn.osgeo.org/qgis/trunk@13800
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster sublayers win fix
 
-2010-06-24  jef 
+Salvatore Larosa 	2013-01-03
 
-	* src/app/qgisapp.cpp, src/app/qgsidentifyresults.cpp: show identify
-	results in layer display order git-svn-id: http://svn.osgeo.org/qgis/trunk@13799
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reorganize icons theme for pyqgis console
+    - add icon to Python Console entry in Plugins menu
 
-2010-06-24  mhugent 
+Bernhard Ströbl 	2013-01-03
 
-	* src/providers/wms/qgswmsprovider.cpp: Fix for problem with mix of
-	toplevel layers and nested layers git-svn-id: http://svn.osgeo.org/qgis/trunk@13798
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6925
+    
+    fTools' eliminate now works if the polygon to merge with has an id of 0
 
-2010-06-24  pcav 
+Sandro Santilli 	2013-01-02
 
-	* i18n/qgis_it.ts: IT GUI translation finished; this round also
-	thanks to Anne Ghisla git-svn-id: http://svn.osgeo.org/qgis/trunk@13797
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Mark topology group visibility off
+    
+    This is really a workaround to http://hub.qgis.org/issues/6938
 
-2010-06-24  macho 
+Larry Shaffer 	2013-01-01
 
-	* i18n/qgis_hu.ts, i18n/qgis_ja.ts: translation update: ja by yoichi
-	and hu by zoltan git-svn-id: http://svn.osgeo.org/qgis/trunk@13795
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #6937, ensure QgsRubberBand is deleted if no active vector layer
 
-2010-06-23  jef 
+Sandro Santilli 	2013-01-01
 
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13794
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reorganize topoviewer layers into subgroups
 
-2010-06-23  jef 
+Larry Shaffer 	2012-12-31
 
-	* AUTHORS, debian/changelog, debian/control, debian/control.hardy,
-	debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.sid, debian/copyright,
-	debian/qgis-plugin-grass.install.in, debian/qgis.install: debian
-	packaging update (following up r13792) git-svn-id: http://svn.osgeo.org/qgis/trunk@13793
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Revert "Fix #6931, apply patch from Borys Jurgiel"
+    
+    This reverts commit bd65e86b5f079ecb8969b3132b64bfbf7d20a1dd.
+    
+    Sorry, did not notice more complete fix in pull request from Salvatore Larosa
 
-2010-06-23  jef 
+Larry Shaffer 	2012-12-31
 
-	* CMakeLists.txt, cmake_templates/qgsconfig.h.in,
-	src/app/qgisapp.cpp, src/core/raster/qgsrasterlayer.cpp,
-	src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassshell.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgsgrass.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp: fix #2822 git-svn-id: http://svn.osgeo.org/qgis/trunk@13792
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6931, apply patch from Borys Jurgiel
 
-2010-06-23  kyngchaos 
+Larry Shaffer 	2012-12-31
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: bundle Qt codecs plugins, in
-	case #2419 affects OSX; allow configuration for custom Qt
-	installation, should help #2760 which needs a PPC cocoa Qt git-svn-id: http://svn.osgeo.org/qgis/trunk@13790
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6725
+    
+    - Restore toggle editing button state in attribute table editor if toggling canceled or commit/rollback changes fails
 
-2010-06-23  jef 
+Larry Shaffer 	2012-12-31
 
-	* src/app/qgisapp.cpp: initialize pointer to optional settings menu
-	- thanks Bruno Binet for spotting this git-svn-id: http://svn.osgeo.org/qgis/trunk@13788
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move toggle/save/rollback/cancel edits slots from private to public
 
-2010-06-23  jef 
+Larry Shaffer 	2012-12-31
 
-	* python/plugins/fTools/tools/doVisual.py: fix #2833 git-svn-id: http://svn.osgeo.org/qgis/trunk@13785
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reinstate Save Active Layer Edits action
+    
+    - Now enables/disables relative to vector layer isModified() state (gives feedback when save is finished)
+    - Now works with active legend layer, regardless of whether a selection exists in legend
+    - Add to legend contextual menu when right-clicked vector layer isModified()
 
-2010-06-23  pcav 
+Larry Shaffer 	2012-12-28
 
-	* i18n/qgis_it.ts: More IT GUI translations - Thanks also to Luca
-	Casagrande and Flavio Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@13784
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Updates to legend active layer
+    
+    - Single click in blank, non-item space in legend unsets active layer (same behavior as clicking group)
+    - Underline active layer (helpful when active layer, and no selection or multiple selected layers)
 
-2010-06-22  macho 
+Juergen E. Fischer 	2012-12-31
 
-	* i18n/qgis_el_GR.ts: translation update: el_GR by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13783
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update and some string fixes
 
-2010-06-22  jef 
+Giuseppe Sucameli 	2012-12-31
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13782
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6932 (due to deprecated getLayerID method removal)
 
-2010-06-22  jef 
+Salvatore Larosa 	2012-12-31
 
-	* src/providers/postgres/qgspostgresprovider.cpp: allow adding
-	features to postgres layers with oid git-svn-id: http://svn.osgeo.org/qgis/trunk@13781
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix for issues generated from api cleanup commit
 
-2010-06-22  macho 
+pcav 	2012-12-31
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: string freeze - as usual -
-	bring in important strings for 1.5 - please dont kill me for that ;)
-	(as im away for a week anyway) git-svn-id: http://svn.osgeo.org/qgis/trunk@13779
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #5843
 
-2010-06-22  pcav 
+Juergen E. Fischer 	2012-12-29
 
-	* i18n/qgis_it.ts: More IT GUI translations - Thanks to Pasquale Di
-	Donato git-svn-id: http://svn.osgeo.org/qgis/trunk@13778
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #5251
 
-2010-06-22  jef 
+Juergen E. Fischer 	2012-12-29
 
-	* debian/qgis.mime: fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@13777
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    geos 3.3.6 doesn't produces geos_c_i on windows anymore also check geos_c
 
-2010-06-22  pcav 
+Larry Shaffer 	2012-12-28
 
-	* i18n/qgis_it.ts: More IT GUI translations - Thanks to Luca
-	Casagrande git-svn-id: http://svn.osgeo.org/qgis/trunk@13774
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6924, finish move from png to new svg icons for Current Edits actions
+    
+    - Remove graphical limitation indicating edit is only vector-based (previously removed themes/gis/mActionSaveEdits.png)
+    - Remove themes/default/mActionSaveEdits.png, just duplicate of mActionsFileSave.png
 
-2010-06-21  wonder 
+Merge: 837f187 2b2da5d
+Martin Dobias 	2012-12-28
 
-	* python/utils.py: Better cleanup of resources when unloading
-	plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@13773
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #350 from matthias-kuhn/qgsmessagebar
+    
+    Transfer ownership of widgets to C++ when pushed to the QgsMessageBar
 
-2010-06-21  jef 
+Nathan Woodrow 	2012-12-28
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13772
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6214. Show names under symbols
 
-2010-06-21  jef 
+Victor Olaya 	2012-12-28
 
-	* i18n/qgis_de.ts, src/app/qgisapp.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui: fix
-	german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13771
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6918
 
-2010-06-21  borysiasty 
+Merge: ce4d03b 8b98197
+Nathan Woodrow 	2012-12-27
 
-	* python/plugins/plugin_installer/CMakeLists.txt,
-	python/plugins/plugin_installer/qgsplugininstallerbase.ui,
-	python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui: 
-	Plugin Instaler update: add translateable strings for future switch
-	to the central contributed repository git-svn-id: http://svn.osgeo.org/qgis/trunk@13770
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #368 from tecoholic/6897
+    
+    Fixes #6897. Handle import of old symbols.
 
-2010-06-21  macho 
+Arunmozhi 	2012-12-27
 
-	* i18n/qgis_de.ts: translation update: german to 100% git-svn-id: http://svn.osgeo.org/qgis/trunk@13769
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixes #6897
 
-2010-06-21  pcav 
+Werner Macho 	2012-12-27
 
-	* i18n/qgis_it.ts: More IT GUI translations - Thanks also to
-	Pasquale Di Donato and Anne Ghisla git-svn-id: http://svn.osgeo.org/qgis/trunk@13768
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added GPL license to file
 
-2010-06-21  kyngchaos 
+Arunmozhi 	2012-12-27
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context_help updates
-	(r13762, r13763) git-svn-id: http://svn.osgeo.org/qgis/trunk@13767
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed style version from 0 to 1
 
-2010-06-21  macho 
+Nathan Woodrow 	2012-12-27
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: time for string freeze!!!! git-svn-id: http://svn.osgeo.org/qgis/trunk@13766
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove Symbol: from symbol selector tree view names
 
-2010-06-21  mhugent 
+Merge: d8b271d 90c571d
+mhugent 	2012-12-27
 
-	* src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix layout
-	problems in georef pdf output by making size of left and right
-	margins a user option git-svn-id: http://svn.osgeo.org/qgis/trunk@13765
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #366 from matthias-kuhn/rubberband-point-symbols
+    
+    Add different point symbols for QgsRubberband.
 
-2010-06-21  mhugent 
+Merge: c419888 6a9c994
+Nathan Woodrow 	2012-12-27
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui: Show
-	checkbox for worldfile. Save output rasters in the same dir as the
-	original raster if no path is given git-svn-id: http://svn.osgeo.org/qgis/trunk@13764
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #367 from tecoholic/imp_style
+    
+    Improved Style functionality. Fix recursive symbol dialogs
 
-2010-06-21  macho 
+Arunmozhi 	2012-12-27
 
-	* resources/context_help/MapServerExport-es_ES,
-	resources/context_help/eVisDatabaseConnectionGui-es_ES: translation
-	update: some context help by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13763
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added scripts/qgisstyle to gitignore
 
-2010-06-21  macho 
+Arunmozhi 	2012-12-27
 
-	* resources/context_help/QgsCustomProjectionDialog-ja_JP,
-	resources/context_help/QgsNewConnection-ja_JP,
-	resources/context_help/QgsNewSpatialiteLayerDialog-ja_JP,
-	resources/context_help/QgsPluginInstallerDialog-ja_JP,
-	resources/context_help/QgsProjectProperties-ja_JP,
-	resources/context_help/QgsVectorLayerProperties-ja_JP: translation
-	update: context help ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13762
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    auto update the symbol DB with 0s in place of NULLs
 
-2010-06-20  macho 
+Merge: 7344368 0ff4324
+Nathan Woodrow 	2012-12-26
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13761
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #365 from tecoholic/improved_symbols
+    
+    fix for #6901.  Fix crash when Changing symbols to > 1 symbology classes
 
-2010-06-20  macho 
+Sandro Santilli 	2012-12-26
 
-	* i18n/qgis_ja.ts: tranlation update: ja by yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13760
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Place new group after current item (for non-group current item)
+    
+    See #6879
+    When current item is a group the behavior is still to append the
+    new group to the end of the child list (as before)
 
-2010-06-20  jef 
+Sandro Santilli 	2012-12-26
 
-	* i18n/qgis_de.ts, src/app/qgisapp.cpp: more translation string
-	fixes and german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13759
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix adding groups to empty projects
+    
+    Closes #6879 again
 
-2010-06-20  kyngchaos 
+Larry Shaffer 	2012-12-26
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context_help updates
-	(r13707); rule-based renderer (r13710); misc xcode fixes and updates git-svn-id: http://svn.osgeo.org/qgis/trunk@13758
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to legend right-click
+    
+    - Right-click now performs widget item change before contextual menu is handled (no more lost right-clicks)
+    - Right-clicks within multiple selection preserve selection, but still switch item
+    - Right-clicks outside of current selection clears selection and switches to new item before contextual menu
 
-2010-06-20  jef 
+Larry Shaffer 	2012-12-18
 
-	* src/app/qgisapp.cpp: fix translation string git-svn-id: http://svn.osgeo.org/qgis/trunk@13757
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add save/rollback/cancel current edits for selected or all vector layers
+    
+    - Fix for issue #6782
+    - Ensure undo widget is not enabled unless active (again)
 
-2010-06-20  wonder 
+Matthias Kuhn 	2012-12-26
 
-	* cmake/Bison.cmake, cmake/COPYING-CMAKE-SCRIPTS,
-	cmake/FindExpat.cmake, cmake/FindGDAL.cmake, cmake/FindGEOS.cmake,
-	cmake/FindGRASS.cmake, cmake/FindIconv.cmake,
-	cmake/FindPostgres.cmake, cmake/FindProj.cmake,
-	cmake/FindQWT.cmake, cmake/FindSPATIALITE.cmake,
-	cmake/FindSqlite3.cmake, cmake/Flex.cmake, cmake/PyQt4Macros.cmake: 
-	Added copyright notices to CMake modules, BSD license has been set
-	to the modules (typical license for CMake modules).  git-svn-id: http://svn.osgeo.org/qgis/trunk@13756
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add pen width to rubberband bounding rect
 
-2010-06-20  wonder 
+Arunmozhi 	2012-12-26
 
-	* src/app/qgssearchquerybuilder.cpp: Fixed #2766.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13755
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed the possibility to recursively open stylemgr and symbol selector
 
-2010-06-20  wonder 
+Juergen E. Fischer 	2012-12-22
 
-	* python/core/qgssearchtreenode.sip,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/qgssearchquerybuilder.cpp,
-	src/core/qgssearchstringlexer.ll, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: Fixed #2346 - allow quoting of column
-	references using double quotes.  Quoting is done in both search
-	query builder and search from attribute table.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13754
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove raster metadata from test data to make tests run without changing git tracked files
 
-2010-06-20  timlinux 
+Juergen E. Fischer 	2012-12-22
 
-	* doc/index.html, src/app/qgisapp.cpp: Updated whats new texts git-svn-id: http://svn.osgeo.org/qgis/trunk@13753
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix msvc build
 
-2010-06-20  jef 
+Matthias Kuhn 	2012-12-25
 
-	* i18n/qgis_de.ts, src/app/qgisapp.cpp: fix #2826 git-svn-id: http://svn.osgeo.org/qgis/trunk@13752
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add different point symbols for QgsRubberband.
 
-2010-06-20  wonder 
+Victor Olaya 	2012-12-24
 
-	* src/app/qgisapp.cpp, src/app/qgsattributedialog.cpp,
-	src/python/qgspythonutils.h: Report python errors when running
-	python commands from qgis gui (e.g. run actions, feature form init).
-	Try to delete feature form only if exists (#2590).  git-svn-id: http://svn.osgeo.org/qgis/trunk@13751
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added missing file with JoinAttributes algorithm
 
-2010-06-19  jef 
+Arunmozhi 	2012-12-24
 
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: fix #2457 git-svn-id: http://svn.osgeo.org/qgis/trunk@13750
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed the parent group id for main groups to 0 from NULL
 
-2010-06-18  mhugent 
+Alexander Bruy 	2012-12-24
 
-	* src/ui/qgscomposertablewidgetbase.ui: Fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@13749
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix python plugins after API cleanup
 
-2010-06-18  pcav 
+Arunmozhi 	2012-12-24
 
-	* i18n/qgis_it.ts: More GUI IT translations git-svn-id: http://svn.osgeo.org/qgis/trunk@13748
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed the ungrouped groupid to 0 from NULL
 
-2010-06-18  mhugent 
+Victor Olaya 	2012-12-24
 
-	* src/core/composer/qgscomposermap.cpp: Fix for bug #2683 git-svn-id: http://svn.osgeo.org/qgis/trunk@13747
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adapted mmqgis and sextante algs to changes in management of selected features
 
-2010-06-17  jef 
+Victor Olaya 	2012-12-23
 
-	* src/app/qgisapp.cpp: fix #2817 git-svn-id: http://svn.osgeo.org/qgis/trunk@13746
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added mechanism for better handling selected features in algorithms
+    Implemented it in fTools Simplify algorithm
 
-2010-06-17  jef 
+Alexander Bruy 	2012-12-20
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13745
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix tests
 
-2010-06-17  jef 
+Alexander Bruy 	2012-12-20
 
-	* python/core/symbology-ng-core.sip, src/app/qgisapp.cpp,
-	src/app/qgscustomprojectiondialog.cpp,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgssinglesymboldialog.cpp, src/core/CMakeLists.txt,
-	src/core/qgsapplication.cpp, src/core/qgsmaplayer.cpp,
-	src/core/qgssearchtreenode.cpp, src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorlayer.cpp,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/core/symbology-ng/qgssymbollayerv2registry.h,
-	src/gui/CMakeLists.txt, src/gui/qgscomposerview.cpp,
-	src/gui/qgsencodingfiledialog.cpp,
-	src/gui/qgstextannotationitem.cpp,
-	src/gui/symbology-ng/characterwidget.cpp,
-	src/gui/symbology-ng/qgsbrushstylecombobox.cpp,
-	src/gui/symbology-ng/qgsbrushstylecombobox.h,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgspenstylecombobox.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp: fix #2815 -
-	including more missing translation strings git-svn-id: http://svn.osgeo.org/qgis/trunk@13744
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove deprecated methods from API
 
-2010-06-17  macho 
+Larry Shaffer 	2012-11-25
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13743
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add CMake option for custom Python framework on Mac
 
-2010-06-17  borysiasty 
+Larry Shaffer 	2012-12-18
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_plugin.py: fix #2775 git-svn-id: http://svn.osgeo.org/qgis/trunk@13742
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Keep attribute editor text synchronization from affecting editing
+    
+    - Cursor no longer jumps to end of text after each edit (on Mac)
+    - Move QgsStringRelay slot definitions into cpp file
+    - Fill editable QComboBox with attribute's value in custom forms
+    - Add validator to editable QComboBox
 
-2010-06-17  rduivenvoorde 
+Juergen E. Fischer 	2012-12-22
 
-	* i18n/qgis_nl.ts: update dutch translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13741
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    osgeo4w: switch to GRASS 6.4.3RC2
 
-2010-06-17  jef 
+Victor Olaya 	2012-12-21
 
-	* src/core/qgssearchstringlexer.ll: apply #2813 git-svn-id: http://svn.osgeo.org/qgis/trunk@13740
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    minor fixes for otb and gdal, and edited some grass descriptions
 
-2010-06-17  mhugent 
+Marco Hugentobler 	2012-12-21
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix for ticket
-	#2814 git-svn-id: http://svn.osgeo.org/qgis/trunk@13739
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Paletted raster renderer: replace nodata values in a color table copy before the main loop
 
-2010-06-16  jef 
+Arunmozhi 	2012-12-21
 
-	* INSTALL, doc/INSTALL.t2t: add dch reference to INSTALL git-svn-id: http://svn.osgeo.org/qgis/trunk@13738
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix for #6901
 
-2010-06-16  mhugent 
+Radim Blazek 	2012-12-21
 
-	* src/app/gps/qgsgpsinformationwidget.cpp: Fix 0 coords in gps
-	feature capturing (appears sometimes when loosing gps connection) git-svn-id: http://svn.osgeo.org/qgis/trunk@13737
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    GRASS Direct test script initial work
 
-2010-06-14  mhugent 
+Merge: 79947fe a9de654
+Marco Hugentobler 	2012-12-21
 
-	* : Added annotation icons provided by Robert. Thanks\! git-svn-id: http://svn.osgeo.org/qgis/trunk@13736
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2010-06-14  jef 
+Radim Blazek 	2012-12-21
 
-	* src/app/qgisapp.h: fix unix build after ugly workaround r13732 git-svn-id: http://svn.osgeo.org/qgis/trunk@13735
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster sublayer test Windows fix
 
-2010-06-14  jef 
+Merge: ac52671 0d9dcb5
+Marco Hugentobler 	2012-12-21
 
-	* cmake/SIPMacros.cmake: fix initial sip binding creation on windows git-svn-id: http://svn.osgeo.org/qgis/trunk@13734
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2010-06-14  jef 
+dassau 	2012-12-21
 
-	* src/app/qgisapp.h: fix ugly workaround r13732 git-svn-id: http://svn.osgeo.org/qgis/trunk@13733
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed german translation for resampling
 
-2010-06-14  jef 
+dassau 	2012-12-21
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptooladdfeature.cpp: workaround #2239 git-svn-id: http://svn.osgeo.org/qgis/trunk@13732
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    small change
 
-2010-06-14  jef 
+Radim Blazek 	2012-12-21
 
-	* src/gui/symbology-ng/qgsrulebasedrendererv2widget.h,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@13731
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use QgsRubberBand constructor with geom type to avoid future break by QgsRubberBand
 
-2010-06-14  mhugent 
+Radim Blazek 	2012-12-21
 
-	* src/core/symbology-ng/qgsrulebasedrendererv2.h,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp: fix msvc build
-	errors git-svn-id: http://svn.osgeo.org/qgis/trunk@13730
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsRubberBand constructor fix (it is not possible to call constructor from constructor in C++ (
+Radim Blazek 	2012-12-20
 
-	* python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/frmGeoprocessing.ui: adds spin box to
-	choose the number of nodes to approximate a circle for the buffer
-	tool git-svn-id: http://svn.osgeo.org/qgis/trunk@13729
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More GRASS direct functions
 
-2010-06-13  jef 
+Radim Blazek 	2012-12-20
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13727
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster creation moved from QgsGdalProvider::create() to GDAL provider extern C function
 
-2010-06-13  macho 
+Werner Macho 	2012-12-20
 
-	* i18n/qgis_es.ts, i18n/qgis_fr.ts,
-	resources/context_help/MapServerExport-fr_FR,
-	resources/context_help/QgsCustomProjectionDialog-fr_FR: translation
-	update: es and fr with some french context help added git-svn-id: http://svn.osgeo.org/qgis/trunk@13726
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: ro by Bogdan
 
-2010-06-13  brushtyler 
+Radim Blazek 	2012-12-20
 
-	* python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/doAbout.py, src/app/qgisapp.cpp: 
-	applied patch to show GDAL version in about dialog, to fix #2804 git-svn-id: http://svn.osgeo.org/qgis/trunk@13725
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    NetCDF sublayers test
 
-2010-06-13  jef 
+Alexander Bruy 	2012-12-20
 
-	* src/core/qgsdistancearea.cpp: fix #2324 git-svn-id: http://svn.osgeo.org/qgis/trunk@13724
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use normalize path (use native separators, avoid duplicate separators)
 
-2010-06-13  mhugent 
+Alexander Bruy 	2012-12-20
 
-	* src/plugins/georeferencer/qgsresidualplotitem.cpp: round residual
-	plot scale bar to reasonable number git-svn-id: http://svn.osgeo.org/qgis/trunk@13723
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use system-wide temp directory for temporary files instead of own dir in
+    user profile
 
-2010-06-12  mhugent 
+Alexander Bruy 	2012-12-20
 
-	* src/ui/qgscomposerpicturewidgetbase.ui: Set maximum to composer
-	picture rotation to 360 git-svn-id: http://svn.osgeo.org/qgis/trunk@13722
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix SEXTANTE CMakeLists.txt
 
-2010-06-12  jef 
+Salvatore Larosa 	2012-11-30
 
-	* src/gui/qgsmapcanvasmap.cpp: fix dirty canvas on startup git-svn-id: http://svn.osgeo.org/qgis/trunk@13721
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix output directory for pyqgis console on installing
 
-2010-06-12  timlinux 
+Victor Olaya 	2012-12-20
 
-	* src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp: 
-	Capitalise first letter of renderer name for consistency git-svn-id: http://svn.osgeo.org/qgis/trunk@13720
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    reorganized native algorithms into one single group
 
-2010-06-12  mhugent 
+Radim Blazek 	2012-12-19
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.h: Fix bug with georef
-	pdf report scale bar units git-svn-id: http://svn.osgeo.org/qgis/trunk@13719
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More GRASS direct functions
 
-2010-06-12  borysiasty 
+Radim Blazek 	2012-12-19
 
-	* images/images.qrc, src/app/qgisapp.cpp: gis theme icons for
-	annotation tools from Robert Szczepanek git-svn-id: http://svn.osgeo.org/qgis/trunk@13718
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster save as VRT fixes and improvements, fixes #6821
 
-2010-06-12  rduivenvoorde 
+Merge: bcca81b e0d9796
+Marco Hugentobler 	2012-12-18
 
-	* python/plugins/mapserver_export/ms_export.py: mapserver export
-	plugin always defaulted to epsg:4326 in mapfile because code still
-	used old elementnames (epsg) instead of new (srid) in .qgs files git-svn-id: http://svn.osgeo.org/qgis/trunk@13717
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'crs_transform_cache'
 
-2010-06-12  borysiasty 
+Radim Blazek 	2012-12-18
 
-	* images/images.qrc: fix #2677: colorful answer from Robert
-	Szczepanek git-svn-id: http://svn.osgeo.org/qgis/trunk@13716
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixed default contrast enhancement for raster multiband / single byte
 
-2010-06-12  jef 
+Juergen E. Fischer 	2012-12-18
 
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsCopyrightLabelPluginGui-de_DE,
-	resources/context_help/QgsGPSPluginGui-de_DE: german translation
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@13715
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  jef 
-
-	* src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h,
-	src/ui/qgsrulebasedrendererv2widget.ui: fix lrelease warning and
-	translation string git-svn-id: http://svn.osgeo.org/qgis/trunk@13714
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  wonder 
-
-	* src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h: Rule-based
-	renderer: show 1:inf instead of 1:0 when there is no max. scale
-	denominator git-svn-id: http://svn.osgeo.org/qgis/trunk@13713
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  pcav 
-
-	* src/plugins/grass/modules-6.4/v.db.dropcol.qgm,
-	src/plugins/grass/modules-common/v.db.dropcol.qgm: Partial fix for
-	#1873 git-svn-id: http://svn.osgeo.org/qgis/trunk@13712
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  wonder 
-
-	* src/core/symbology-ng/qgsrulebasedrendererv2.cpp: Rule-based
-	renderer: respect the original scale range when refining the rule
-	based on scales.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13711
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  wonder 
-
-	* python/analysis/qgsoverlayanalyzer.sip,
-	python/core/symbology-ng-core.sip, src/core/CMakeLists.txt,
-	src/core/symbology-ng/qgsrendererv2registry.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.cpp,
-	src/core/symbology-ng/qgsrulebasedrendererv2.h,
-	src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsrulebasedrendererv2widget.h,
-	src/ui/qgsrendererrulepropsdialogbase.ui,
-	src/ui/qgsrulebasedrendererv2widget.ui: [FEATURE] Added rule-based
-	renderer for symbology-ng.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA]".  For the project: "Sviluppo di
-	prodotti software GIS open-source basati sui prodotti QuantumGIS e
-	Postgis (CIG 037728516E) git-svn-id: http://svn.osgeo.org/qgis/trunk@13710
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-12  pcav 
-
-	* DONORS, src/app/qgisapp.cpp,
-	src/plugins/grass/modules-common/v.db.what.connect.qgm: Fixed #3630,
-	edited v.db.what.connect, updated DONORS git-svn-id: http://svn.osgeo.org/qgis/trunk@13709
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-11  rduivenvoorde 
-
-	* python/plugins/mapserver_export/ms_export.py: fix for #2726 labels
-	no labels in mapserverexport git-svn-id: http://svn.osgeo.org/qgis/trunk@13708
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-11  macho 
-
-	* i18n/qgis_ja.ts, resources/context_help/MapServerExport-ja_JP,
-	resources/context_help/QgsAttributeTableDialog-ja_JP,
-	resources/context_help/QgsBookmarks-ja_JP,
-	resources/context_help/QgsComposer-ja_JP,
-	resources/context_help/QgsCopyrightLabelPluginGui-ja_JP,
-	resources/context_help/QgsDelimitedTextPluginGui-ja_JP,
-	resources/context_help/QgsGPSPluginGui-ja_JP,
-	resources/context_help/QgsIdentifyResults-ja_JP,
-	resources/context_help/QgsMeasureDialog-ja_JP,
-	resources/context_help/QgsNewOgrConnection-ja_JP,
-	resources/context_help/QgsNewVectorLayerDialog-ja_JP,
-	resources/context_help/QgsNorthArrowPluginGui-ja_JP,
-	resources/context_help/QgsOpenVectorLayerDialog-ja_JP,
-	resources/context_help/QgsOptions-ja_JP,
-	resources/context_help/QgsPgSourceSelect-ja_JP,
-	resources/context_help/QgsScaleBarPluginGui-ja_JP,
-	resources/context_help/QgsSpatiaLiteSourceSelect-ja_JP,
-	resources/context_help/QgsStyleV2ManagerDialog-ja_JP,
-	resources/context_help/QgsWMSSourceSelect-ja_JP,
-	resources/context_help/eVisDatabaseConnectionGui-ja_JP: translation
-	update and added context help: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13707
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-11  brushtyler 
-
-	* python/plugins/GdalTools/tools/dialogBase.ui,
-	python/plugins/GdalTools/tools/optionsTable.ui,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui,
-	python/plugins/GdalTools/tools/widgetClipper.ui,
-	python/plugins/GdalTools/tools/widgetContour.ui,
-	python/plugins/GdalTools/tools/widgetConvert.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetMerge.ui,
-	python/plugins/GdalTools/tools/widgetNearBlack.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPolygonize.ui,
-	python/plugins/GdalTools/tools/widgetProjection.ui,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetSieve.ui,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: replaced all
-	QFormLayouts with QGridLayouts git-svn-id: http://svn.osgeo.org/qgis/trunk@13703
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-11  rduivenvoorde 
-
-	* i18n/qgis_nl.ts: dutch translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13702
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-06-10  brushtyler 
-
-	* python/plugins/GdalTools/GdalTools.py: load modules only on menu
-	triggers, skip the local traslator git-svn-id: http://svn.osgeo.org/qgis/trunk@13701
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-18
 
-2010-06-10  mhugent 
+    Delete raster provider also if invalid
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: More decimals in
-	georef pdf report git-svn-id: http://svn.osgeo.org/qgis/trunk@13700
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-18
 
-2010-06-09  mhugent 
+    GRASS r.bitpattern fix
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Show rotation in
-	degrees in georef status bar git-svn-id: http://svn.osgeo.org/qgis/trunk@13696
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-18
 
-2010-06-08  jef 
+    More GRASS direct functions
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13695
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-18
 
-2010-06-08  jef 
+    Improved raster singleband pseudocolor classification GUI
 
-	* src/providers/wms/qgswmsprovider.cpp: fix #2592 git-svn-id: http://svn.osgeo.org/qgis/trunk@13694
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-18
 
-2010-06-08  wonder 
+    Followup to 9069f3b
+    
+    - Avoid canvas refresh when new command is added after user clicks back in undo view history
 
-	* python/utils.py: Fixed unloading of python modules which were
-	imported using "from X import Y,Z".  Modules Y,Z have been missed by
-	the import wrapper and the unloader did not remove the plugin
-	completely/correctly.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13693
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-17
 
-2010-06-08  mhugent 
+    Expose setGroupExpanded to python
 
-	* src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgssinglesymbolrenderer.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.cpp: Fix for marker size in
-	map units git-svn-id: http://svn.osgeo.org/qgis/trunk@13687
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-17
 
-2010-06-07  kyngchaos 
+    Survive when setLayerExpanded is called with a layer unknown by legend
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: add __init__.py (r13682) git-svn-id: http://svn.osgeo.org/qgis/trunk@13686
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-17
 
-2010-06-07  jef 
+    Add QgsAppLegendInterface::setLayerExpanded method
+    
+    .. and use it from the db_manager plugin
 
-	* debian/rules: followup r13683 git-svn-id: http://svn.osgeo.org/qgis/trunk@13685
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-17
 
-2010-06-07  brushtyler 
+    More GRASS direct functions
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/doAbout.py: import the modules
-	without use the path git-svn-id: http://svn.osgeo.org/qgis/trunk@13684
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-17
 
-2010-06-07  jef 
+    Fix addGroup() not to refuse invisibleRootItem as the group parent
+    
+    Fixes #6879.
+    NOTE: if a caller really wants to add a group to current item
+          there's a specific method for that: addGroupToCurrentItem
 
-	* debian/control, debian/rules: fix template cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13683
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-17
 
-2010-06-07  brushtyler 
+    Raster statistics and histogram moved from QgsRasterDataProvider to QgsRasterInterface
 
-	* python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/tools/CMakeLists.txt,
-	python/plugins/GdalTools/tools/__init__.py,
-	python/plugins/GdalTools/tools/doAbout.py: Removed the unnecessary
-	setted paths git-svn-id: http://svn.osgeo.org/qgis/trunk@13682
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-17
 
-2010-06-07  jef 
+    Removed GDAL dependencies where easily possible
 
-	* src/plugins/grass/modules-common/r.in.gdal.qgis.qgm,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h: fix #2788 git-svn-id: http://svn.osgeo.org/qgis/trunk@13681
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-17
 
-2010-06-07  pcav 
+    QgsRasterBlock::DataType moved to QGis::DataType
 
-	* DONORS: Updated DONORS git-svn-id: http://svn.osgeo.org/qgis/trunk@13680
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-17
 
-2010-06-07  jef 
+    update anomality images for stingray
 
-	* src/app/main.cpp: (visibly) complain about missing $DISPLAY git-svn-id: http://svn.osgeo.org/qgis/trunk@13679
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-17
 
-2010-06-07  mhugent 
+    Use coordinate transform cache in maprenderer
 
-	* src/core/qgsapplication.cpp: Consider changed pkgDataPath in
-	default svg paths git-svn-id: http://svn.osgeo.org/qgis/trunk@13678
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-17
 
-2010-06-07  mhugent 
+    Cache for coordinate transformations
 
-	* src/core/CMakeLists.txt: install symbology-ng headers git-svn-id: http://svn.osgeo.org/qgis/trunk@13676
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-17
 
-2010-06-07  macho 
+    don't break the loop after interior ring while calculating perimeter:
+    
+    the returned ptr's pointing to a wrong position whether we break the loop before reading all the points of all the rings.
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13674
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: cdaebd1 a18cb51
+volaya 	2012-12-16
 
-2010-06-06  jef 
+    Merge pull request #360 from slarosa/sextante-issue
+    
+    Fixes issue #5505 (sextante/nviz)
 
-	* debian/rules: debian packaging update: include templates in clean git-svn-id: http://svn.osgeo.org/qgis/trunk@13673
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-12-16
 
-2010-06-06  macho 
+    Fixes issue #5505
 
-	* i18n/qgis_fr.ts: translation update: fr by jeanroc git-svn-id: http://svn.osgeo.org/qgis/trunk@13672
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-16
 
-2010-06-06  jef 
+    More GRASS direct functions
 
-	* i18n/qgis_fr.ts, i18n/qgis_ru.ts, i18n/qgis_uk.ts: integrate
-	GdalTools translations from faunalia repository git-svn-id: http://svn.osgeo.org/qgis/trunk@13671
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-16
 
-2010-06-06  macho 
+    Change binding for QgsMapRenderer::render
 
-	* i18n/qgis_el_GR.ts: translation update: el_GR by Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13670
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-16
 
-2010-06-06  jef 
+    fix help files installation for TauDEM
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: update_ts_files.sh run after GdalTools
-	integration git-svn-id: http://svn.osgeo.org/qgis/trunk@13669
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 3b3d1a7 948faef
+mhugent 	2012-12-15
 
-2010-06-06  jef 
+    Merge pull request #354 from Oslandia/atlas
+    
+    refs #6741
 
-	* i18n/qgis_de.ts, python/plugins/GdalTools/tools/doAbout.py: make
-	GdalTools about box translatable git-svn-id: http://svn.osgeo.org/qgis/trunk@13668
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-14
 
-2010-06-06  macho 
+    Update labeling tools and make more undo/redo friendly
+    
+    - Change QgsVectorLayer::redoEditCommand to only strip invalid QVariants, not null ones
+    - Update undo/redo command text to start with action and end with sample of label text
+    - Update pin/unpin labels tool to be fully undo/redo-able
+    - Store generated label text in QgsLabelPosition (sans direction symbols)
+    - Update change label properties dialog to show whether label text is expression
 
-	* i18n/qgis_fr.ts, i18n/qgis_hr_HR.ts, i18n/qgis_ja.ts: translation
-	update: hr_HR by Zoran, fr and ja string update git-svn-id: http://svn.osgeo.org/qgis/trunk@13667
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 33e3925 3a59fd4
+Victor Olaya 	2012-12-15
 
-2010-06-05  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
+    
+    Conflicts:
+python/plugins/sextante/grass/ext/CMakeLists.txt           
 
-	* src/providers/wms/qgswmsprovider.cpp: fix wms legacy CRS/SRS mixup git-svn-id: http://svn.osgeo.org/qgis/trunk@13666
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-12-15
 
-2010-06-05  jef 
+    added postgis tools to sextante
+    edited some grass descriptions and renamed postproc folder (now it is not only for postproc, but also for pre execution checks)
 
-	* ms-windows/QGIS-Installer.nsi: remove second RequestExecutionLevel git-svn-id: http://svn.osgeo.org/qgis/trunk@13665
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-15
 
-2010-06-05  jef 
+    More GRASS direct functions
 
-	* ms-windows/QGIS-Installer.nsi, ms-windows/osgeo4w/creatensis.pl: 
-	add script to build nsis standalone installer from OSGeo4W packages git-svn-id: http://svn.osgeo.org/qgis/trunk@13664
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-14
 
-2010-06-05  kyngchaos 
+    Update undo/redo widget and vector layer rollback
+    
+    - Allows for any number of undo/redo commands with only one refresh
+    - Significantly decreases time needed to cancel or redo many edits
+    - Disable undo/redo dock's widgets and toolbar actions when layer not in editing mode
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: bundle programs and python stuff
-	from GDAL for use by plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@13663
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-14
 
-2010-06-05  kyngchaos 
+    TopoViewer: make topology group start as collapsed
 
-	* INSTALL, doc/INSTALL.t2t: OSX install updates git-svn-id: http://svn.osgeo.org/qgis/trunk@13662
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-14
 
-2010-06-05  macho 
+    Initialize all members in Interval constructor.
+    
+    Fixes memory conditional jumps depending on uninitialized values
+    and as a consequence the unstable results from qgis_expressiontest
+    
+    Closes #6877
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13661
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-14
 
-2010-06-05  mhugent 
+    Fix addGroup to return the integer groupIndex other methods expect
+    
+    This commit fixes #6591, although doesn't make the existing
+    interface any better than it is, and it is really bad :)
+    No plugin should need any adaption with the changes.
 
-	* src/core/CMakeLists.txt, src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Some changes to use
-	qgslegendmodel without a running x-server git-svn-id: http://svn.osgeo.org/qgis/trunk@13660
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-14
 
-2010-06-05  jef 
+    More GRASS direct functions
 
-	* python/plugins/GdalTools/tools/dialogSettings.ui,
-	src/analysis/interpolation/Vector3D.h,
-	src/app/ogr/qgsogrsublayersdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.h,
-	src/app/qgspluginmanager.cpp, src/app/qgswmssourceselect.cpp,
-	src/core/qgspluginlayerregistry.cpp,
-	src/core/qgsproviderregistry.cpp, src/core/qgsvectorfilewriter.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.h,
-	src/core/symbology/qgssymbol.cpp,
-	src/gui/qgsprojectbadlayerguihandler.h,
-	src/plugins/georeferencer/qgsmapcoordsdialog.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/plugins/grass/qgis.g.browser.cpp,
-	src/plugins/grass/qgsgrassedittools.cpp,
-	src/plugins/grass/qgsgrassmapcalc.h,
-	src/plugins/grass/qgsgrassmodel.cpp,
-	src/plugins/grass/qgsgrassmodule.h,
-	src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassselect.cpp,
-	src/plugins/grass/qgsgrassshell.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/plugins/oracle_raster/qgsoracleconnect_ui.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/grass/qgis.d.rast.c,
-	src/python/qgspythonutilsimpl.cpp, src/python/qgspythonutilsimpl.h,
-	tests/src/core/testqgssearchstring.cpp: automatic indentation update
-	(r12600-r13658) git-svn-id: http://svn.osgeo.org/qgis/trunk@13659
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: d997863 7e34355
+volaya 	2012-12-14
 
-2010-06-05  mhugent 
+    Merge pull request #358 from slarosa/sextante-issue
+    
+    fix for sextante/convexhull tool based on field
 
-	* src/core/composer/qgscomposermap.cpp: Added code to fix bug #2755
-	also for Qt<4.6 git-svn-id: http://svn.osgeo.org/qgis/trunk@13658
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-12-14
 
-2010-06-05  jef 
+    fix for sextante/convexhull tool based on field
+    the tool does not work if option "Create convex hulls based on field" is used
+    to due of missing some methods. This patch fixes the issue.
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13657
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 968c6d8 eff5c20
+mhugent 	2012-12-13
 
-2010-06-05  jef 
+    Merge pull request #357 from matthias-kuhn/rb
+    
+    Set default rubberband width
 
-	* src/analysis/interpolation/Bezier3D.h,
-	src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp: fix typos git-svn-id: http://svn.osgeo.org/qgis/trunk@13656
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Matthias Kuhn 	2012-12-14
 
-2010-06-05  jef 
+    Set default rubberband width
+    Was uninitialized, leading to screen corruption
+    http://hub.qgis.org/issues/6845
 
-	* debian/changelog, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.lucid, debian/control.sid,
-	debian/libqgis{QGIS_ABI}.lintian-overrides,
-	debian/qgis-plugin-grass.lintian-overrides, debian/rules: debian
-	packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13655
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-14
 
-2010-06-05  jef 
+    Set nodata values in raster block
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13654
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-05  jef 
-
-	* python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/doTranslate.py: string fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@13653
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  jef 
-
-	* src/providers/wms/qgswmsprovider.cpp: wms provider fix: shift tile
-	requests a bit NE git-svn-id: http://svn.osgeo.org/qgis/trunk@13652
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  timlinux 
-
-	* : Added over to google projection parameters as per
-	fwarmerdam.blogspot.com/2010/02/world-mapping.html git-svn-id: http://svn.osgeo.org/qgis/trunk@13651
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  timlinux 
-
-	* CMakeLists.txt: Make version name tethys for the upcoming release git-svn-id: http://svn.osgeo.org/qgis/trunk@13650
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  macho 
-
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13649
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: add gdaltools (r13639) git-svn-id: http://svn.osgeo.org/qgis/trunk@13648
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  jef 
-
-	* src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp: unquote
-	field names in delimited text plugin like in the provider git-svn-id: http://svn.osgeo.org/qgis/trunk@13646
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  brushtyler 
-
-	* python/plugins/GdalTools/tools/GdalTools_utils.py: manage string
-	in release name git-svn-id: http://svn.osgeo.org/qgis/trunk@13644
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  brushtyler 
-
-	* python/plugins/GdalTools/tools/GdalTools_utils.py: manage string
-	in release name git-svn-id: http://svn.osgeo.org/qgis/trunk@13643
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  brushtyler 
-
-	* src/app/legend/qgslegend.cpp: undoing change committed in r13640.
-	This test become unnecessary from r13641 git-svn-id: http://svn.osgeo.org/qgis/trunk@13642
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-06-04  brushtyler 
+Marco Hugentobler 	2012-12-13
 
-	* src/app/legend/qgslegend.cpp: applied patch to fix #699 git-svn-id: http://svn.osgeo.org/qgis/trunk@13641
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement readBlock in gdal provider for performance reason
 
-2010-06-04  brushtyler 
+Alexander Bruy 	2012-12-14
 
-	* src/app/legend/qgslegend.cpp: fixed #2711: avoid jumping items in
-	legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13640
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    move missed CMakeLists.txt to ext directory, fix path
 
-2010-06-04  brushtyler 
+Merge: f2fc33b 2c59866
+Victor Olaya 	2012-12-13
 
-	* python/plugins/CMakeLists.txt,
-	python/plugins/GdalTools/CMakeLists.txt,
-	python/plugins/GdalTools/GdalTools.py,
-	python/plugins/GdalTools/LICENSE,
-	python/plugins/GdalTools/__init__.py,
-	python/plugins/GdalTools/icons/CMakeLists.txt,
-	python/plugins/GdalTools/resources.qrc,
-	python/plugins/GdalTools/tools/CMakeLists.txt,
-	python/plugins/GdalTools/tools/GdalTools_utils.py,
-	python/plugins/GdalTools/tools/dialogAbout.ui,
-	python/plugins/GdalTools/tools/dialogBase.py,
-	python/plugins/GdalTools/tools/dialogBase.ui,
-	python/plugins/GdalTools/tools/dialogSRS.py,
-	python/plugins/GdalTools/tools/dialogSettings.ui,
-	python/plugins/GdalTools/tools/doAbout.py,
-	python/plugins/GdalTools/tools/doBuildVRT.py,
-	python/plugins/GdalTools/tools/doClipper.py,
-	python/plugins/GdalTools/tools/doContour.py,
-	python/plugins/GdalTools/tools/doGrid.py,
-	python/plugins/GdalTools/tools/doInfo.py,
-	python/plugins/GdalTools/tools/doMerge.py,
-	python/plugins/GdalTools/tools/doNearBlack.py,
-	python/plugins/GdalTools/tools/doOverview.py,
-	python/plugins/GdalTools/tools/doPctRgb.py,
-	python/plugins/GdalTools/tools/doPolygonize.py,
-	python/plugins/GdalTools/tools/doProjection.py,
-	python/plugins/GdalTools/tools/doProximity.py,
-	python/plugins/GdalTools/tools/doRasterize.py,
-	python/plugins/GdalTools/tools/doRgbPct.py,
-	python/plugins/GdalTools/tools/doSettings.py,
-	python/plugins/GdalTools/tools/doSieve.py,
-	python/plugins/GdalTools/tools/doTranslate.py,
-	python/plugins/GdalTools/tools/doWarp.py,
-	python/plugins/GdalTools/tools/optionsTable.py,
-	python/plugins/GdalTools/tools/optionsTable.ui,
-	python/plugins/GdalTools/tools/widgetBatchBase.py,
-	python/plugins/GdalTools/tools/widgetBuildVRT.ui,
-	python/plugins/GdalTools/tools/widgetClipper.ui,
-	python/plugins/GdalTools/tools/widgetContour.ui,
-	python/plugins/GdalTools/tools/widgetConvert.ui,
-	python/plugins/GdalTools/tools/widgetGrid.ui,
-	python/plugins/GdalTools/tools/widgetInfo.ui,
-	python/plugins/GdalTools/tools/widgetMerge.ui,
-	python/plugins/GdalTools/tools/widgetNearBlack.ui,
-	python/plugins/GdalTools/tools/widgetOverview.ui,
-	python/plugins/GdalTools/tools/widgetPluginBase.py,
-	python/plugins/GdalTools/tools/widgetPolygonize.ui,
-	python/plugins/GdalTools/tools/widgetProjection.ui,
-	python/plugins/GdalTools/tools/widgetProximity.ui,
-	python/plugins/GdalTools/tools/widgetRasterize.ui,
-	python/plugins/GdalTools/tools/widgetSieve.ui,
-	python/plugins/GdalTools/tools/widgetTranslate.ui,
-	python/plugins/GdalTools/tools/widgetWarp.ui: added GdalTools plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@13639
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-06-03  borysiasty 
+Victor Olaya 	2012-12-13
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Borys git-svn-id: http://svn.osgeo.org/qgis/trunk@13638
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    more grass-sextante improvements (mainly fine tuning some algorithms)
 
-2010-06-03  borysiasty 
+dassau 	2012-12-13
 
-	* src/app/qgisapp.cpp: fix wrong status tip git-svn-id: http://svn.osgeo.org/qgis/trunk@13637
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed strange translation for clip tool (ftools)
 
-2010-06-03  borysiasty 
+Alexander Bruy 	2012-12-13
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert Szczepanek git-svn-id: http://svn.osgeo.org/qgis/trunk@13636
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missed CMakeLists.txt for SEXTANTE GRASS provider
 
-2010-06-03  wonder 
+Victor Olaya 	2012-12-12
 
-	* tests/src/core/CMakeLists.txt: Revert accidental commit git-svn-id: http://svn.osgeo.org/qgis/trunk@13635
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added fix by Salvatore Larosa that fixes #6862
 
-2010-06-03  timlinux 
+Merge: d401a6e f218a39
+Victor Olaya 	2012-12-12
 
-	* AUTHORS: Added Giuseppe Sucameli to authors list git-svn-id: http://svn.osgeo.org/qgis/trunk@13634
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-06-03  mhugent 
+Werner Macho 	2012-12-12
 
-	* src/core/composer/qgscomposermap.cpp: Fix for canvas item order in
-	print composer (ticket #2755) git-svn-id: http://svn.osgeo.org/qgis/trunk@13633
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adding licenses to a few files more - we are under 100 files ..
 
-2010-06-03  macho 
+Alexander Bruy 	2012-12-12
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13632
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix QgsDistanceArea bindings
 
-2010-06-03  wonder 
+Merge: 32f0dfd d9a3c99
+Marco Hugentobler 	2012-12-12
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	tests/src/core/CMakeLists.txt: Fixed #2744 git-svn-id: http://svn.osgeo.org/qgis/trunk@13631
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'wms_raster_performance'
 
-2010-06-03  wonder 
+Marco Hugentobler 	2012-12-12
 
-	* src/core/qgspallabeling.cpp: Fixed #2780 git-svn-id: http://svn.osgeo.org/qgis/trunk@13630
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add comment
 
-2010-06-02  timlinux 
+Marco Hugentobler 	2012-12-12
 
-	* : Updated splash for release git-svn-id: http://svn.osgeo.org/qgis/trunk@13629
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Some loop optimisations
 
-2010-06-02  mhugent 
+Marco Hugentobler 	2012-12-12
 
-	* src/app/composer/qgscomposer.cpp: automatically append pdf and svg
-	suffixes (#ticket 2776) git-svn-id: http://svn.osgeo.org/qgis/trunk@13628
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix unwanted double reading in last commit
 
-2010-06-02  jef 
+Radim Blazek 	2012-12-12
 
-	* src/python/qgspythonutilsimpl.cpp: fix python runtime error when
-	no HOME is set git-svn-id: http://svn.osgeo.org/qgis/trunk@13627
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More GRASS direct functions for Windows
 
-2010-06-02  mhugent 
+Marco Hugentobler 	2012-12-12
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h: show residuals in
-	pixel for non-linear transformations git-svn-id: http://svn.osgeo.org/qgis/trunk@13626
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Avoid null fill in gdal provider if raster covers the whole requested extent. Enable raster provider code block which was outcommented in earlier commit
 
-2010-06-02  jef 
+Juergen E. Fischer 	2012-12-12
 
-	* debian/changelog, debian/compat.lucid, debian/control.hardy,
-	debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.lucid,
-	debian/control.sid: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13625
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    improve html viewing in identify results window:
+    - add print to normal context menu instead of replacing it completely
+    - enable inspection with QGISDEBUG
+    - allow accessing remote urls
+    - use QgsNetworkManager (eg. to allow skip SSL errors or do
+      authenticaton)
 
-2010-06-02  jef 
+Hugo Mercier 	2012-12-12
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13624
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    refs #6741
+    Fix resolution issues when printing in raster mode
 
-2010-06-02  macho 
+Merge: e38b222 d584b76
+mhugent 	2012-12-12
 
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13623
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #352 from Oslandia/atlas
+    
+    Fix atlas composition
 
-2010-06-02  kyngchaos 
+Marco Hugentobler 	2012-12-12
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: move labelling to core
-	(r13607, r13608) git-svn-id: http://svn.osgeo.org/qgis/trunk@13622
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Loop optimisation
 
-2010-06-01  jef 
+Larry Shaffer 	2012-12-07
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp: 
-	[FEATURE] delimited text provider: allow empty values in numeric
-	columns git-svn-id: http://svn.osgeo.org/qgis/trunk@13621
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add SVG symbol of QGIS north arrow decoration (provided by ramon)
+    
+    - Feature request #6814
+    - Converted 'N' text to path and centered
 
-2010-06-01  jef 
+Merge: a4186df c84408e
+Victor Olaya 	2012-12-12
 
-	* ms-windows/osgeo4w/postinstall.bat: osgeo4w update: qgisconfig.py
-	was dropped git-svn-id: http://svn.osgeo.org/qgis/trunk@13620
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
+    
+    Conflicts:
+python/plugins/sextante/grass/GrassAlgorithm.py           
 
-2010-06-01  mhugent 
+Victor Olaya 	2012-12-12
 
-	* src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h: 
-	change map unit in project dialog when user selects a new crs git-svn-id: http://svn.osgeo.org/qgis/trunk@13619
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added DensifyGeometriesInterval.py by @underdark, and fixed existent DensifyGeometries.py
 
-2010-06-01  jef 
+Victor Olaya 	2012-12-12
 
-	* debian/changelog, debian/qgis-plugin-grass-common.install.lenny: 
-	debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13618
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improving GRASS bindings and editing GASS descriptions
 
-2010-06-01  mhugent 
+Radim Blazek 	2012-12-11
 
-	* src/core/CMakeLists.txt: Add pallabeling to core header files git-svn-id: http://svn.osgeo.org/qgis/trunk@13617
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    define extern C also functions implemented in qgsgrassgislib.cpp, it should make functions visible on Windows
 
-2010-06-01  mhugent 
+Radim Blazek 	2012-12-11
 
-	* src/app/qgslabelinggui.cpp, src/ui/qgslabelingguibase.ui: Small
-	enhancements for labeling dialog: disable minimum size ui for
-	points, add pt to font name and set two decimal places for distance
-	spin boxes git-svn-id: http://svn.osgeo.org/qgis/trunk@13616
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More info if GRASS modules fails. G__getenv to see if it moves forward on Windows.
 
-2010-05-31  borysiasty 
+Werner Macho 	2012-12-11
 
-	* : add GDAL compatible CRSes (without +towgs84 parameters) for
-	Polish epsg: 2172-2180, 3120, 3328-3335 and 4179 as epsg+40000 git-svn-id: http://svn.osgeo.org/qgis/trunk@13615
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    updates to licenses
+    
+    Again some updates to clean the whole QGIS tree of unlicensed files.
+    Main purpose is to make the source tree checkable by debian licensechecker to clearly state the license of QGIS and find out if everything is compatible.
 
-2010-05-31  jef 
+Merge: 6e8bf84 dcf3ede
+Hugo Mercier 	2012-12-11
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13614
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
+    
+    Conflicts:
+src/core/composer/qgsatlascomposition.cpp           
 
-2010-05-31  macho 
+Hugo Mercier 	2012-12-11
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13613
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix the atlas composer: use the stored number of features, instead of featureCount()
 
-2010-05-31  rduivenvoorde 
+Alexander Bruy 	2012-11-29
 
-	* i18n/qgis_nl.ts: dutch translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13612
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    make username and password in-out parameters in QgsCredentials bindings
 
-2010-05-31  jef 
+Radim Blazek 	2012-12-11
 
-	* debian/qgis.install: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13611
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    G__init_null_patterns GRASS 6.5, fixes #6849
 
-2010-05-31  jef 
+Juergen E. Fischer 	2012-12-11
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13610
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-05-31  mhugent 
+Larry Shaffer 	2012-12-10
 
-	* src/app/qgisapp.cpp: Fix for previous label commits git-svn-id: http://svn.osgeo.org/qgis/trunk@13609
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Ensure Composer set to zoomFull() when shown from menu or manager
+    
+    - Zoom full happens on initial showing or showing after hiding, via user close or spontaneously by os
+    - If Composer is open, behind other windows or minimized, zoom state is maintained
 
-2010-05-31  mhugent 
+Larry Shaffer 	2012-12-10
 
-	* src/plugins/labeling/CMakeLists.txt,
-	src/plugins/labeling/labeling.cpp, src/plugins/labeling/labeling.h,
-	src/plugins/labeling/labeling.qrc: Remove legacy files git-svn-id: http://svn.osgeo.org/qgis/trunk@13608
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add ability to save parent project when in Composer
 
-2010-05-31  mhugent 
+Larry Shaffer 	2012-12-09
 
-	* images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgslabelengineconfigdialog.cpp,
-	src/app/qgslabelengineconfigdialog.h, src/app/qgslabelinggui.cpp,
-	src/app/qgslabelinggui.h, src/app/qgslabelpreview.cpp,
-	src/app/qgslabelpreview.h, src/core/CMakeLists.txt,
-	src/core/qgspallabeling.cpp, src/core/qgspallabeling.h,
-	src/plugins/CMakeLists.txt, src/plugins/labeling/CMakeLists.txt,
-	src/plugins/labeling/engineconfigdialog.cpp,
-	src/plugins/labeling/engineconfigdialog.h,
-	src/plugins/labeling/engineconfigdialog.ui,
-	src/plugins/labeling/labeling.cpp, src/plugins/labeling/labeling.h,
-	src/plugins/labeling/labelinggui.cpp,
-	src/plugins/labeling/labelinggui.h,
-	src/plugins/labeling/labelingguibase.ui,
-	src/plugins/labeling/labelpreview.cpp,
-	src/plugins/labeling/labelpreview.h,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h,
-	src/ui/qgsengineconfigdialog.ui, src/ui/qgslabelingguibase.ui: Move
-	Martins labeling-ng from plugin to core/app git-svn-id: http://svn.osgeo.org/qgis/trunk@13607
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix aligned multi-line labels for print or image output
 
-2010-05-31  mhugent 
+Larry Shaffer 	2012-12-10
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp: [FEATURE]
-	georeferencer: possibility to configure if residuals should be
-	showed in pixels or map units git-svn-id: http://svn.osgeo.org/qgis/trunk@13606
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix GRASS module tools dialog on Mac
+    
+    - Show disclosure triangles for QTreeWidget item sections and root (were hidden)
+    - Root for tree set to decorated, as double-click to collapse/expand is set, and could hide children
 
-2010-05-31  macho 
+Larry Shaffer 	2012-12-10
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13605
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    GRASS module env variable fix for Mac
 
-2010-05-30  jef 
+Matthias Kuhn 	2012-12-10
 
-	* src/app/qgsattributedialog.cpp: revert r13584 noop git-svn-id: http://svn.osgeo.org/qgis/trunk@13604
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Transfer ownership of widgets to C++ when pushed to the QgsMessageBar
 
-2010-05-30  jef 
+Radim Blazek 	2012-12-10
 
-	* src/app/qgsrasterlayerproperties.cpp: fix #1683 git-svn-id: http://svn.osgeo.org/qgis/trunk@13603
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    GRASS Direct: Mac DYLD_LIBRARY_PATH fix
 
-2010-05-30  wonder 
+Marco Hugentobler 	2012-12-10
 
-	* src/core/composer/qgscomposition.cpp: Fix a crash when using map
-	composer within python git-svn-id: http://svn.osgeo.org/qgis/trunk@13602
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    inline more raster block methods
 
-2010-05-30  wonder 
+Larry Shaffer 	2012-12-10
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.h,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h,
-	src/ui/qgscategorizedsymbolrendererv2widget.ui: [FEATURE] manual
-	adding of categories in symbology-ng. Patch contributed by Lynx,
-	thanks! + added missing python bindings and fixed some issues.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13601
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix Grass Direct module build on Mac
 
-2010-05-30  jef 
+Alexander Bruy 	2012-12-10
 
-	* src/app/qgisapp.cpp, src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.cpp: fix #2763 git-svn-id: http://svn.osgeo.org/qgis/trunk@13600
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    pass unicode string to TreeSettingItem
 
-2010-05-29  wonder 
+Nathan Woodrow 	2012-12-10
 
-	* src/plugins/labeling/labelinggui.cpp,
-	src/plugins/labeling/labelingguibase.ui,
-	src/plugins/labeling/labelpreview.cpp,
-	src/plugins/labeling/labelpreview.h,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h: Applied patch #2739 from Marco -
-	correct scaling of labeling from the labeling plugin in composer.
-	Includes few tweaks and improvements, additionally the buffer is not
-	considered for the label frame.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13599
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6843
 
-2010-05-29  mhugent 
+Werner Macho 	2012-12-10
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/core/qgsprojectfiletransform.cpp,
-	src/core/qgsprojectfiletransform.h: Project file transform from 1.4
-	to 1.5. Improved project loading for composers and annotation items
-	to use the modified dom, not the original file. Fixes ticket #2751 git-svn-id: http://svn.osgeo.org/qgis/trunk@13598
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added machine readable GPL2 to dxflib
 
-2010-05-29  kyngchaos 
+Giuseppe Sucameli 	2012-12-10
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: fix moc compile rule git-svn-id: http://svn.osgeo.org/qgis/trunk@13597
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    yet another fix following 3da32c00d5
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-10
 
-	* src/providers/ogr/qgsogrprovider.cpp: ogr provider update: lazy
-	determine extent (fixes #2752) git-svn-id: http://svn.osgeo.org/qgis/trunk@13596
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    another change missing in 3da32c00d
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-10
 
-	* src/app/qgisapp.cpp: fix #2753 git-svn-id: http://svn.osgeo.org/qgis/trunk@13595
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6842
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-10
 
-	* src/plugins/oracle_raster/qgsoracle_plugin.cpp: followup r13593:
-	mention oracle in georaster tooltip git-svn-id: http://svn.osgeo.org/qgis/trunk@13594
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6847
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-10
 
-	* src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp,
-	src/plugins/oracle_raster/qgsselectgeoraster_ui.h: fix #2759 and
-	some cleanups git-svn-id: http://svn.osgeo.org/qgis/trunk@13593
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6846
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-09
 
-	* src/app/ogr/qgsvectorlayersaveasdialog.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/core/qgsvectorfilewriter.cpp: followup
-	r13591: force KML encoding to utf-8 in save as dialog and move
-	filename/encoding validation to vector file write git-svn-id: http://svn.osgeo.org/qgis/trunk@13592
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6848
 
-2010-05-29  mhugent 
+Giuseppe Sucameli 	2012-12-10
 
-	* src/app/qgisapp.cpp: Use utf-8 if saving to kml to prevent invalid
-	xml git-svn-id: http://svn.osgeo.org/qgis/trunk@13591
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+     add fix for file missed in d83ed0aa1a0
 
-2010-05-29  jef 
+Giuseppe Sucameli 	2012-12-09
 
-	* src/app/ogr/qgsvectorlayersaveasdialog.cpp: fix #2756 git-svn-id: http://svn.osgeo.org/qgis/trunk@13590
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    do not translate geometry types, change dbmanager translation context names (fix #6837)
 
-2010-05-29  jef 
+Werner Macho 	2012-12-10
 
-	* src/core/qgsvectorfilewriter.cpp: fix #2761 git-svn-id: http://svn.osgeo.org/qgis/trunk@13589
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adding license
 
-2010-05-29  jef 
+Juergen E. Fischer 	2012-12-10
 
-	* python/core/qgsgeometry.sip,
-	src/analysis/vector/qgszonalstatistics.cpp,
-	src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/plugins/labeling/pallabeling.cpp: add length() and area()
-	methods to QgsGeometry and use it in labeling and zonal statistics git-svn-id: http://svn.osgeo.org/qgis/trunk@13588
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update fake grass library build on windows
 
-2010-05-29  wonder 
+Juergen E. Fischer 	2012-12-10
 
-	* python/core/qgsmaprenderer.sip, src/core/qgsmaprenderer.h,
-	src/core/qgsvectorlayer.cpp, src/plugins/labeling/labelinggui.cpp,
-	src/plugins/labeling/labelingguibase.ui,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h: Applied patch #2747 from Marco.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13587
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-05-29  jef 
+Juergen E. Fischer 	2012-12-10
 
-	* src/core/qgscoordinatereferencesystem.cpp: fix #2601 git-svn-id: http://svn.osgeo.org/qgis/trunk@13586
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove trailing blanks
 
-2010-05-29  mhugent 
+Marco Hugentobler 	2012-12-09
 
-	* src/core/composer/qgscomposerarrow.cpp,
-	src/core/composer/qgscomposition.cpp: Fix for zList sort problem and
-	added call to composer item readXML in composer arrow git-svn-id: http://svn.osgeo.org/qgis/trunk@13585
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Store colors directly as qrgb in paletted raster renderer for faster drawing
 
-2010-05-28  jef 
+Marco Hugentobler 	2012-12-09
 
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: postgres provider
-	update: - lazy determine extent and invalidate extent on subst string change
-	(fixes #2752 for postgres) - use estimate extent when "use estimate metadata" is set (reverts
-	r13499) - remove rest of unused threading git-svn-id: http://svn.osgeo.org/qgis/trunk@13584
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Disable block in raster provider for performance reason
 
-2010-05-28  jef 
+Juergen E. Fischer 	2012-12-09
 
-	* src/plugins/wfs/qgswfssourceselect.cpp: fix #2757 git-svn-id: http://svn.osgeo.org/qgis/trunk@13583
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build of fake grass lib
 
-2010-05-28  jef 
+Victor Olaya 	2012-12-08
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsrasterlayerproperties.h: apply #1683 (completes r13568) git-svn-id: http://svn.osgeo.org/qgis/trunk@13582
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6227
 
-2010-05-28  macho 
+Victor Olaya 	2012-12-08
 
-	* i18n/qgis_cs_CZ.ts: translationi update: CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13581
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    improved new algorithm classification mechanism
+    fixed #6834
 
-2010-05-28  jef 
+Sandro Santilli 	2012-12-07
 
-	* resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsPgSourceSelect-de_DE: fix typo in english
-	context help and update german context help git-svn-id: http://svn.osgeo.org/qgis/trunk@13580
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Drop orphaned TopoGeometry objects on deleteFeatures
 
-2010-05-28  pcav 
+Sandro Santilli 	2012-12-07
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13579
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add minorVersion() method, fix doc of majorVersion()
 
-2010-05-26  mhugent 
+Marco Hugentobler 	2012-12-07
 
-	* src/app/qgisapp.h: fix for compile problem git-svn-id: http://svn.osgeo.org/qgis/trunk@13578
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More wms optimisations: create pallabeling only once, take crs from cache
 
-2010-05-26  borysiasty 
+Marco Hugentobler 	2012-12-07
 
-	* src/ui/qgsoptionsbase.ui: Fix initial page of the option
-	stackedWidget - patch from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13577
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Optimization in writing raster values in paletted raster renderer
 
-2010-05-26  borysiasty 
+Victor Olaya 	2012-12-07
 
-	* resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsPgSourceSelect-en_US,
-	resources/context_help/QgsPgSourceSelect-pl_PL,
-	resources/context_help/QgsProjectProperties-pl_PL,
-	resources/context_help/QgsVectorLayerProperties-pl_PL,
-	src/ui/qgsoptionsbase.ui, src/ui/qgsrasterlayerpropertiesbase.ui: 
-	more help updates and ui cleanups from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13576
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added alternative organization in sextante toolbox
 
-2010-05-25  borysiasty 
+Marco Hugentobler 	2012-12-07
 
-	* resources/context_help/QgsProjectProperties-en_US,
-	resources/context_help/QgsProjectProperties-pl_PL: help updates from
-	Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13575
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  ersts 
-
-	* src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp: -Fix
-	for ticket #2621 -Also fixed a bug in the select tool that was
-	causing qgis to crash if no feature was selected.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13574
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13573
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13572
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  mhugent 
-
-	* python/core/qgssearchtreenode.sip,
-	src/app/qgssearchquerybuilder.cpp, src/app/qgssearchquerybuilder.h,
-	src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: 
-	[FEATURE]: Load/save queries created in the query builder. Added
-	method columnRefNodes() in qgssearchtreenode and added some consts git-svn-id: http://svn.osgeo.org/qgis/trunk@13571
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use CRS cache and avoid sqlite lookup for each request
 
-2010-05-25  mhugent 
-
-	* src/core/raster/qgsrasterlayer.cpp: Reenable legend icons for
-	rasters git-svn-id: http://svn.osgeo.org/qgis/trunk@13570
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  macho 
-
-	* i18n/qgis_el_GR.ts: translation update: el_GR by Mike and Nikos git-svn-id: http://svn.osgeo.org/qgis/trunk@13569
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-25  timlinux 
-
-	* src/ui/qgsattributeactiondialogbase.ui,
-	src/ui/qgsattributeloadfrommap.ui,
-	src/ui/qgsattributetabledialog.ui,
-	src/ui/qgscategorizedsymbolrendererv2widget.ui,
-	src/ui/qgscomposerlabelwidgetbase.ui,
-	src/ui/qgscomposerlegendwidgetbase.ui,
-	src/ui/qgscomposermanagerbase.ui,
-	src/ui/qgscomposertablewidgetbase.ui,
-	src/ui/qgscomposervectorlegendbase.ui,
-	src/ui/qgscompositionwidgetbase.ui,
-	src/ui/qgsgraduatedsymboldialogbase.ui,
-	src/ui/qgsgraduatedsymbolrendererv2widget.ui,
-	src/ui/qgslabeldialogbase.ui, src/ui/qgsmessageviewer.ui,
-	src/ui/qgsnewogrconnectionbase.ui,
-	src/ui/qgsnewspatialitelayerdialogbase.ui,
-	src/ui/qgsnewvectorlayerdialogbase.ui,
-	src/ui/qgsopenvectorlayerdialogbase.ui,
-	src/ui/qgspgsourceselectbase.ui,
-	src/ui/qgsprojectionselectorbase.ui, src/ui/qgsquerybuilderbase.ui,
-	src/ui/qgsrasterlayerpropertiesbase.ui,
-	src/ui/qgsrendererv2propsdialogbase.ui,
-	src/ui/qgsspatialitesridsdialogbase.ui,
-	src/ui/qgsstylev2managerdialogbase.ui,
-	src/ui/qgssymbolv2propertiesdialogbase.ui,
-	src/ui/qgssymbolv2selectordialogbase.ui,
-	src/ui/qgsuniquevaluedialogbase.ui,
-	src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui,
-	src/ui/qgsvectorgradientcolorrampv2dialogbase.ui,
-	src/ui/qgsvectorlayersaveasdialogbase.ui,
-	src/ui/qgswmssourceselectbase.ui,
-	src/ui/symbollayer/widget_linedecoration.ui,
-	src/ui/symbollayer/widget_markerline.ui,
-	src/ui/symbollayer/widget_simplefill.ui,
-	src/ui/symbollayer/widget_simpleline.ui,
-	src/ui/symbollayer/widget_simplemarker.ui,
-	src/ui/symbollayer/widget_svgfill.ui,
-	src/ui/symbollayer/widget_svgmarker.ui: UI updates from Milena
-	Nowotarska git-svn-id: http://svn.osgeo.org/qgis/trunk@13568
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/src/x_qgsspatialitesourceselect.cpp, src/app/qgisapp.h: 
-	remove postgres threading (r13557); fix missing 'new spatialite
-	layer' function (#2745); misc cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13567
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  pcav 
-
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13566
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_ca_ES.ts,
-	i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts, i18n/qgis_el_GR.ts,
-	i18n/qgis_es.ts, i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: String update and new German git-svn-id: http://svn.osgeo.org/qgis/trunk@13565
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  jef 
-
-	* i18n/qgis_de.ts: fix warning in german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13564
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  macho 
-
-	* i18n/qgis_de.ts: translation update: bring german to 100% ;) git-svn-id: http://svn.osgeo.org/qgis/trunk@13563
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  macho 
-
-	* i18n/qgis_cs_CZ.ts: translation update: czech by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13562
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h: georeferencer: fix
-	closeEvent handling for dock widget.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13561
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsmapcoordsdialog.cpp: georeferencer: fix
-	crash which occured when adding GCPs after the widget docking has
-	been disabled.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13560
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: georeferencer:
-	Fix crash due to deletion of parent dock in destructor.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13559
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  jef 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13558
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-24  jef 
-
-	* src/providers/postgres/CMakeLists.txt,
-	src/providers/postgres/qgspostgisbox2d.cpp,
-	src/providers/postgres/qgspostgisbox2d.h,
-	src/providers/postgres/qgspostgisbox3d.cpp,
-	src/providers/postgres/qgspostgisbox3d.h,
-	src/providers/postgres/qgspostgrescountthread.cpp,
-	src/providers/postgres/qgspostgrescountthread.h,
-	src/providers/postgres/qgspostgresextentthread.cpp,
-	src/providers/postgres/qgspostgresextentthread.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: postgres provider:
-	remove unused threading code git-svn-id: http://svn.osgeo.org/qgis/trunk@13557
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-06
 
-2010-05-24  jef 
+    More GRASS direct modules
 
-	* i18n/qgis_ca_ES.ts, i18n/qgis_es_CA.ts: es_CA should be ca_ES git-svn-id: http://svn.osgeo.org/qgis/trunk@13556
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: ef6da72 fc22a6f
+mhugent 	2012-12-06
 
-2010-05-23  macho 
+    Merge pull request #341 from matthias-kuhn/rubberband-point
+    
+    Allow the rubberband to display points
 
-	* i18n/qgis_es_CA.ts: added catalan translation file ..  git-svn-id: http://svn.osgeo.org/qgis/trunk@13555
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-06
 
-2010-05-23  mmassing 
+    GRASS compilation fix 2
 
-	* src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp: georeferencer: Fix
-	parameter reporting when enabling/disabling GCPs.  Updates the model before emiting pointEnabled signal, so that
-	downstream handlers work with up-to-date transform parameters.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13554
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-06
 
-2010-05-23  mmassing 
+    GRASS compilation fix
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp: Print units of
-	residual as well.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13553
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-11-09
 
-2010-05-23  mmassing 
+    GRASS Direct
 
-	* src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h: Applied patch #2731
-	by mhugent: show georeferencer residuals in map units when possible.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13552
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-06
 
-2010-05-22  jef 
+    Fetch topological layer info at construction time
+    
+    Simplify addFeatures and changeGeometryValues accordingly
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetablemodel.h: let attribute table
-	follow canvas extent git-svn-id: http://svn.osgeo.org/qgis/trunk@13551
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-12-06
 
-2010-05-22  macho 
+    Code and comment tidy up in geometry clip test
 
-	* i18n/qgis_de.ts: translation update: mainly grass translations git-svn-id: http://svn.osgeo.org/qgis/trunk@13550
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-12-06
 
-2010-05-22  jef 
+    Transfer ownership of transparency to prevent crashing python apps.
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13549
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: b304df8 8a90e2c
+mhugent 	2012-12-06
 
-2010-05-22  jef 
+    Merge pull request #345 from bischofia/joined_minmax
+    
+    fix references to joined fields of vector layer
 
-	* src/core/qgsvectorlayer.cpp: remove progress indication from
-	symbology-ng rendering: sometimes featureCount() is expensive and
-	moveover only applies when the canvas covers the full layer extent,
-	which is not always the case.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13548
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-12-06
 
-2010-05-22  jef 
+    adding missing files to basque translation
 
-	* src/app/attributetable/qgsattributetablememorymodel.cpp,
-	src/app/attributetable/qgsattributetablememorymodel.h,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/attributetable/qgsattributetablemodel.h,
-	src/app/qgsoptions.cpp, src/ui/qgsoptionsbase.ui: [FEATURE] forward
-	port r9689 to model based attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@13547
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-06
 
-2010-05-22  jef 
+    fix #6817 (introduce with a1a1fb7be)
 
-	* src/app/qgsattributedialog.cpp: select current value when lineedit
-	gets focus in attribute dialog (fixes #2742) git-svn-id: http://svn.osgeo.org/qgis/trunk@13546
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-06
 
-2010-05-22  mhugent 
+    fix fields creation importing layers to PG
 
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/ui/qgscomposerbase.ui: Applied patch #2159 from ctimko git-svn-id: http://svn.osgeo.org/qgis/trunk@13545
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-05
 
-2010-05-21  mmassing 
+    remove trailing whitespace
 
-	* src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h: Amend previously
-	ommited docking feature of patch #2673.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13544
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-05
 
-2010-05-21  mhugent 
+    fix warning
 
-	* src/core/composer/qgslegendmodel.cpp: Fix for crash with composer
-	legend during project file save git-svn-id: http://svn.osgeo.org/qgis/trunk@13543
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-05
 
-2010-05-20  pcav 
+    dbmanager: minor fixes
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13542
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-30
 
-2010-05-20  macho 
+    do not use st_multi when SL < 2.4 (follow 2469c5aa17)
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: es by Carlos and the monthly
-	string update for alle files on request git-svn-id: http://svn.osgeo.org/qgis/trunk@13541
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-29
 
-2010-05-20  jef 
+    SL provider: convert geometries to multipart when necessary (fix #6257)
 
-	* src/app/attributetable/qgsattributetableview.cpp: fix attribute
-	table position restore git-svn-id: http://svn.osgeo.org/qgis/trunk@13540
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-05
 
-2010-05-20  pcav 
+    import vector layer: allow to create single-part geometries from shapefile (follow 08e844f6d06)
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13538
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-05
 
-2010-05-20  mhugent 
+    connect missed signal
 
-	* src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgscomposerattributetable.h: Fix for crash if
-	removing a layer with a related composer attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@13537
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-12-05
 
-2010-05-20  pcav 
+    add missing FindQextserialport.cmake to complete issue #6613
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13536
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-05
 
-2010-05-20  mhugent 
+    fix SL provider (follow 90972db78a):
+    
+    fix build linking SL < v4,
+    fix SL4 database version check,
+    rename SPATIALITE_RECENT_VERSION macro to the more significant SPATIALITE_VERSION_GE_4_0_0,
 
-	* src/ui/qgsgpsinformationwidgetbase.ui: Fix typo git-svn-id: http://svn.osgeo.org/qgis/trunk@13535
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-05
 
-2010-05-20  pcav 
+    dbmanager: allow to import layer from canvas (fix #6824),
+    add dialog to choose vector file to be imported (fix #6825),
+    allow to export table to vector file (fix #6826)
+    
+    Thanks to Silvio Grosso for the sponsorship!
 
-	* i18n/qgis_it.ts: More IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13534
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-04
 
-2010-05-20  jef 
+    german translation update
 
-	* src/app/qgsvectorlayerproperties.cpp: followup r13529 git-svn-id: http://svn.osgeo.org/qgis/trunk@13533
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-04
 
-2010-05-19  mhugent 
+    fix indentation and some translation strings
 
-	* src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Reenabled update for composer
-	legend layers git-svn-id: http://svn.osgeo.org/qgis/trunk@13532
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-04
 
-2010-05-19  pcav 
+    fix typo
 
-	* i18n/qgis_it.ts: More coherence in IT GUI translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13531
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: d32a377 47097b7
+Giuseppe Sucameli 	2012-12-04
 
-2010-05-19  macho 
+    Merge pull request #346 from brushtyler/splite4_provider
+    
+    update SL provider to use SpatiaLite v4 features
 
-	* i18n/qgis_el_GR.ts: translation update: el_GR by nikos git-svn-id: http://svn.osgeo.org/qgis/trunk@13530
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-04
 
-2010-05-19  jef 
+    add missed renderer capabilities to Python bindings
 
-	* src/app/qgsvectorlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h: lazy fill meta data page in
-	vector layer properties git-svn-id: http://svn.osgeo.org/qgis/trunk@13529
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-12-04
 
-2010-05-18  jef 
+    Grass bindings improvements in SEXTANTE
+    Fixed minor bugs in SAGA an GDAL merge algorithms
 
-	* src/app/qgisapp.cpp: fix #2732 git-svn-id: http://svn.osgeo.org/qgis/trunk@13528
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-12-03
 
-2010-05-18  cfarmer 
+    Allow connection with local ident on non-standard port
 
-	* python/plugins/fTools/tools/doVectorSplit.py,
-	python/plugins/fTools/tools/ftools_utils.py: Fix output folder
-	selection for split vector layers tool. Patch from alexbruy. Fixes
-	#2725.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13527
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-03
 
-2010-05-18  mhugent 
+    checkable action for toolbox and cleanup
 
-	* src/core/composer/qgscomposerlegenditem.cpp,
-	src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp: Fix raster item in composer
-	legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13526
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-03
 
-2010-05-18  mhugent 
+    create help edition dialog from .ui
 
-	* src/core/composer/qgscomposerlegend.cpp: Fix legend item label
-	problem #2727 git-svn-id: http://svn.osgeo.org/qgis/trunk@13525
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-01
 
-2010-05-18  jef 
+    add placeholder text for filters
 
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: postgres provider:
-	lazy feature count git-svn-id: http://svn.osgeo.org/qgis/trunk@13524
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-01
 
-2010-05-18  mhugent 
+    create modeller dialog from .ui file
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp: Add
-	transformation name in georef pdf report git-svn-id: http://svn.osgeo.org/qgis/trunk@13523
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-01
 
-2010-05-18  macho 
+    create config dialog from .ui
+    add tooltips to search boxes
 
-	* i18n/qgis_de.ts: small changes in german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13522
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-11-12
 
-2010-05-18  jef 
+    use QgsFilterLineEdit in toolbox instead of own implementation
 
-	* src/ui/qgsvectorlayerpropertiesbase.ui: fix #2361 git-svn-id: http://svn.osgeo.org/qgis/trunk@13521
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-01
 
-2010-05-18  macho 
+    create history dialog from .ui file
 
-	* TRANSLATORS: added new most active translators to the translators
-	list git-svn-id: http://svn.osgeo.org/qgis/trunk@13520
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-30
 
-2010-05-17  jef 
+    new sexy lineedit widget with builtin clear button
 
-	* src/app/qgsvectorlayerproperties.cpp, src/ui/qgsoptionsbase.ui,
-	src/ui/qgsrasterlayerpropertiesbase.ui,
-	src/ui/qgsvectorlayerpropertiesbase.ui: append space to list widgets
-	in options and vector and raster layer property dialogs (fixes
-	#2554) git-svn-id: http://svn.osgeo.org/qgis/trunk@13519
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-30
 
-2010-05-17  jef 
+    create results viewer dialog from .ui
 
-	* src/app/attributetable/qgsattributetableidcolumnpair.cpp: fix
-	#2531 git-svn-id: http://svn.osgeo.org/qgis/trunk@13518
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-30
 
-2010-05-17  jef 
+    create toolbox from .ui file
+    add clear button to filter (fix #5695)
 
-	* python/gui/qgsmapcanvas.sip, src/app/qgisapp.cpp,
-	src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h: apply #2712 and
-	#2716 with slight modification.  Thanks to Charles Timko.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13517
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-12-03
 
-2010-05-17  jef 
+    Properly encode direction symbols in style templates (#6812)
+    
+    NOTE: this commit does NOT fix the project save operation,
+          but only an output of that operation
 
-	* i18n/qgis_de.ts, src/app/legend/qgslegendlayer.cpp,
-	src/app/qgisapp.cpp: fix query translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13516
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-03
 
-2010-05-17  mhugent 
+    fix #6800 (introduced with 0dc01f5ff)
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix calculation
-	of mean error in georeferencer git-svn-id: http://svn.osgeo.org/qgis/trunk@13515
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-03
 
-2010-05-17  jef 
+    Update text and tips for mActionSaveAllEdits
+    
+    - Add separator to Layers menu to organize attribute table functions
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13514
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-12-03
 
-2010-05-17  macho 
+    corrected copyright headers
 
-	* i18n/qgis_cs_CZ.ts: translation update: cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13513
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-30
 
-2010-05-17  mhugent 
+    SLD support: export local svg paths to URI (fix #6792)
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: 
-	Automatically append pdf suffix for georef report git-svn-id: http://svn.osgeo.org/qgis/trunk@13512
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-30
 
-2010-05-16  jef 
+    move svg utils functions to the symbollayerv2utils class
 
-	* src/app/postgres/qgspgsourceselect.cpp: fix #2627 git-svn-id: http://svn.osgeo.org/qgis/trunk@13511
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-12-02
 
-2010-05-16  jef 
+    fix segfaults and memory leaks in sip files (fix #6805)
 
-	* python/core/qgslabelattributes.sip, src/app/qgslabeldialog.cpp,
-	src/core/qgslabel.cpp, src/core/qgslabel.h,
-	src/core/qgslabelattributes.cpp, src/core/qgslabelattributes.h,
-	src/ui/qgslabeldialogbase.ui: [FEATURE] label only selected features
-	(implements #2717) git-svn-id: http://svn.osgeo.org/qgis/trunk@13510
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5cf1c77 871d4e8
+Giuseppe Sucameli 	2012-12-02
 
-2010-05-16  borysiasty 
+    Merge pull request #348 from slarosa/sextante-issue
+    
+    fixes #6228 (slarosa think definitely, and so do I :))
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13509
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-12-02
 
-2010-05-16  jef 
+    fixes #6228 (I think definitely)
 
-	* src/core/qgscoordinatereferencesystem.cpp: fix #2670 git-svn-id: http://svn.osgeo.org/qgis/trunk@13508
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-11-06
 
-2010-05-16  jef 
+    Initial support for adding new TopoGeometry objects
 
-	* src/app/qgsidentifyresults.cpp, src/app/qgsidentifyresults.h: fix
-	position restore of identify results git-svn-id: http://svn.osgeo.org/qgis/trunk@13507
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-12-02
 
-2010-05-16  cfarmer 
+    Name change for language
 
-	* python/plugins/fTools/tools/doGeometry.py: Fix merge all
-	functionality in singleparts to multipart ftools function. Fixes
-	#2550.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13506
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-12-02
 
-2010-05-16  jef 
+    translation update: gl_ES by Xan
 
-	* python/gui/qgsrubberband.sip, src/app/qgisapp.cpp,
-	src/app/qgsmaptoolmovefeature.cpp, src/app/qgsmaptoolmovefeature.h,
-	src/gui/qgsrubberband.cpp, src/gui/qgsrubberband.h: [FEATURE] add
-	multiple features at once (implements #2710) git-svn-id: http://svn.osgeo.org/qgis/trunk@13505
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-02
 
-2010-05-16  macho 
+    fix 45a933a4
 
-	* i18n/qgis_el_GR.ts: translation update: el_GR by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13504
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-01
 
-2010-05-16  cfarmer 
+    Add edit-saving actions to iface
 
-	* python/plugins/fTools/tools/doGeoprocessing.py: More specific
-	warnings for geoprocessing tools when missing crs are detected.
-	Addresses #2547.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13503
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-01
 
-2010-05-16  jef 
+    Add legend icon for editable layers with unsaved edits
 
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13502
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-12-01
 
-2010-05-16  jef 
+    Add 'Save All Edits' action to layers menu and digitizing toolbar
 
-	* images/images.qrc, python/core/symbology-ng-core.sip,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/legend/qgslegendlayer.cpp, src/app/legend/qgslegendlayer.h,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsattributedialog.cpp, src/app/qgsattributedialog.h,
-	src/app/qgsmaptoolnodetool.cpp, src/app/qgsmeasuredialog.cpp,
-	src/app/qgsundowidget.cpp, src/core/qgsapplication.cpp,
-	src/core/qgsmaplayerregistry.cpp, src/core/qgsmaplayerregistry.h,
-	src/core/qgsvectorlayer.cpp: [FEATURE] - save edits button added (implements #2579) - subset option to layer menu (implements #2660) - show selected feature count in status bar (implements #2708) - temporary workaround for #2714 - refactored redundant code from legend to qgisapp:   attribute table, save as, layer removal, layer properties - some more cleanups git-svn-id: http://svn.osgeo.org/qgis/trunk@13501
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-02
 
-2010-05-16  jef 
+    german translation update
 
-	* src/gui/qgsmapcanvas.cpp: temporary workaround for #2714 git-svn-id: http://svn.osgeo.org/qgis/trunk@13500
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-12-02
 
-2010-05-16  jef 
+    adding missing copyright to files
 
-	* src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	fix feature count, when subset string is set git-svn-id: http://svn.osgeo.org/qgis/trunk@13499
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-01
 
-2010-05-16  jef 
+    indentation update
 
-	* python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/ftools_utils.py: fix ftools typo git-svn-id: http://svn.osgeo.org/qgis/trunk@13498
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-12-01
 
-2010-05-15  jef 
+    fix #6803
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13497
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-12-01
 
-2010-05-15  jef 
+    add tooltips for groups and providers (fix #5951)
 
-	* python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doSpatialJoin.py, src/app/qgisapp.cpp: 
-	translation string fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@13496
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e7995cf 69308d3
+Magnus Homann 	2012-12-01
 
-2010-05-15  jef 
+    Merge pull request #343 from homann/qgsexpression_DA
+    
+    Settings for measurements ellipsoid moved, fix for #3296 and #4252.
 
-	* src/app/qgswmssourceselect.cpp: improve image format selecting in
-	wms selection dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@13495
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-01
 
-2010-05-15  mhugent 
+    customization enable fix
 
-	* src/app/main.cpp, src/core/qgsapplication.cpp: Move setWindowIcon
-	from qgsapplication.cpp to main.cpp. Because QGIS mapserver uses
-	qgsapplication, but it does not have access to an x-server instance git-svn-id: http://svn.osgeo.org/qgis/trunk@13494
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-01
 
-2010-05-15  mhugent 
+    global customization enable checkbox
 
-	* src/core/composer/qgscomposerlegend.cpp: Fix minimum size of
-	composer legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13493
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-12-01
 
-2010-05-15  mhugent 
+    more precise layer min/max scale description + icon
 
-	* src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Fix drag drop behaviour of
-	composer legend items git-svn-id: http://svn.osgeo.org/qgis/trunk@13492
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+pcav 	2012-12-01
 
-2010-05-15  mhugent 
+    IT GUI translation
 
-	* src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegenditem.cpp,
-	src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Drag and drop support for
-	composer legend model git-svn-id: http://svn.osgeo.org/qgis/trunk@13491
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+pcav 	2012-11-30
 
-2010-05-15  macho 
+    Load layer in canvas Checked (fixes #6641)
 
-	* i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts: translation update: bg by
-	Zahari and cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13490
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 047127b 635e19a
+volaya 	2012-11-30
 
-2010-05-15  jef 
+    Merge pull request #342 from slarosa/master
+    
+    fix for #6749 and #6278
 
-	* cmake/FindPyQt.py, cmake/FindPyQt4.cmake, python/CMakeLists.txt,
-	src/providers/grass/qgis.g.info.c, src/providers/grass/qgsgrass.cpp: 
-	working fix for #2670 and fix for GRASS 6.2 support (as found on
-	debian lenny) git-svn-id: http://svn.osgeo.org/qgis/trunk@13489
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-30
 
-2010-05-15  jef 
+    [FEATURE] update SL provider to use statistics (available from spatialite v4.0).
+    
+    Patch by Alessandro Furieri.
 
-	* cmake/FindPyQt4.cmake, python/CMakeLists.txt: fix #2720 git-svn-id: http://svn.osgeo.org/qgis/trunk@13488
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-11-30
 
-2010-05-14  kyngchaos 
+    added Basque language on request .. this is our 50! Language!
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: SIP proxy factory by PyQt
-	version (r13468) composer legend item (r13476) git-svn-id: http://svn.osgeo.org/qgis/trunk@13486
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9342a9c aab08cb
+Marco Hugentobler 	2012-11-30
 
-2010-05-14  pcav 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* i18n/qgis_it.ts: More typos and updates in IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13485
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-11-30
 
-2010-05-14  mhugent 
+    [FEATURE]: use a custom linestyle for composer grid
 
-	* src/gui/qgslegendinterface.h: Fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@13484
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Minoru Akagi 	2012-11-30
 
-2010-05-14  mhugent 
+    fix references to joined fields of vector layer
 
-	* src/app/composer/qgscomposerlegendwidget.cpp: Remove Qt 4.6
-	dependency git-svn-id: http://svn.osgeo.org/qgis/trunk@13483
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2012-11-30
 
-2010-05-13  cfarmer 
+    Remove InsertResults
 
-	* python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doIntersectLines.py,
-	python/plugins/fTools/tools/doMeanCoords.py,
-	python/plugins/fTools/tools/doPointsInPolygon.py,
-	python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/doRandom.py,
-	python/plugins/fTools/tools/doReProject.py,
-	python/plugins/fTools/tools/doRegPoints.py,
-	python/plugins/fTools/tools/doSelectByLocation.py,
-	python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/doSubsetSelect.py,
-	python/plugins/fTools/tools/doSumLines.py,
-	python/plugins/fTools/tools/doVectorGrid.py,
-	python/plugins/fTools/tools/doVisual.py: New warning when creating
-	empty multipart layer; Ok button disabled on all functions while
-	running; General bug fixes. Fixes #2260, #2057, and #1986. Another
-	great patch from alexbruy :-) git-svn-id: http://svn.osgeo.org/qgis/trunk@13481
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-11-30
 
-2010-05-13  cfarmer 
+    import vector layer: pass empty geometry column importing non-spatial table, do not deference null pointer (fix #6728)
 
-	* python/plugins/fTools/tools/frmJoinAttributes.ui: Quick typo fix.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13480
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2012-11-30
 
-2010-05-13  cfarmer 
+    WFS-T debugging and using provider for adding features
 
-	* python/plugins/fTools/icons/default/CMakeLists.txt,
-	python/plugins/fTools/tools/doJoinAttributes.py: Some simple bug
-	fixes. Fixes #2695. Patch from alexbruy.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13479
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-11-30
 
-2010-05-13  cfarmer 
+    Fix saving of excluded attributes for wms/wfs server
 
-	* python/plugins/fTools/tools/doPointDistance.py: now supports
-	fields containing non-ascii chars. Fixes #2496. Patch from alexbruy git-svn-id: http://svn.osgeo.org/qgis/trunk@13478
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-11-30
 
-2010-05-13  cfarmer 
+    fixed #6759 and #6228
 
-	* python/plugins/fTools/tools/doVectorSplit.py: now supports fields
-	containing Cyrillics. Fixes #2566. Patch from alexbruy git-svn-id: http://svn.osgeo.org/qgis/trunk@13477
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-13  mhugent 
-
-	* src/app/composer/qgscomposerlegendwidget.cpp,
-	src/app/composer/qgscomposerlegendwidget.h,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.h, src/core/CMakeLists.txt,
-	src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegend.h,
-	src/core/composer/qgscomposerlegenditem.cpp,
-	src/core/composer/qgscomposerlegenditem.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h, src/gui/qgslegendinterface.h,
-	src/ui/qgscomposerlegendwidgetbase.ui: [FEATURE]: Export legend
-	groups and layers with legendinterface and use this information to
-	display groups in the composer legend. Todo: fix drag and frop in
-	composer legend, readXML, cleanups in composer legend model git-svn-id: http://svn.osgeo.org/qgis/trunk@13476
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-13  jef 
-
-	* src/plugins/grass/qgsgrassmodule.cpp: next take on #2620 - not
-	reproducable here git-svn-id: http://svn.osgeo.org/qgis/trunk@13475
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-13  jef 
-
-	* cmake/FindPyQt4.cmake, debian/changelog, debian/control,
-	python/CMakeLists.txt,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: make PyQt4
-	detection work with CMake 2.6.0 as found in Debian lenny git-svn-id: http://svn.osgeo.org/qgis/trunk@13473
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-12  jef 
-
-	* src/app/qgsmergeattributesdialog.cpp: implement #2696 git-svn-id: http://svn.osgeo.org/qgis/trunk@13472
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-12  jef 
-
-	* src/app/qgsmaptoolidentify.cpp, src/gui/qgsrubberband.cpp: apply
-	#2692. Thanks again Jeremy.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13471
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-12  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: fix #2707 git-svn-id: http://svn.osgeo.org/qgis/trunk@13470
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-12  jef 
-
-	* src/app/qgsidentifyresults.cpp: fix #2682 git-svn-id: http://svn.osgeo.org/qgis/trunk@13469
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-11  jef 
-
-	* python/CMakeLists.txt: tie proxy factory support in SIP bindings
-	to PyQt4 version instead of Qt git-svn-id: http://svn.osgeo.org/qgis/trunk@13468
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-11  jef 
-
-	* python/core/qgsrasterdataprovider.sip,
-	python/core/qgsrasterlayer.sip, src/app/qgsidentifyresults.cpp,
-	src/app/qgsmaptoolidentify.cpp, src/core/qgsrasterdataprovider.h,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: [FEATURE] (re-?)add
-	identifyAsHtml to raster layer and use it in identify git-svn-id: http://svn.osgeo.org/qgis/trunk@13467
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-11  pcav 
-
-	* i18n/qgis_it.ts: Two typos in IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13466
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  jef 
-
-	* src/app/qgswmssourceselect.cpp,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h,
-	src/ui/qgswmssourceselectbase.ui: implement #2702 git-svn-id: http://svn.osgeo.org/qgis/trunk@13465
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  jef 
-
-	* doc/style.css, images/svg/north_arrows/NorthArrow1.svg,
-	images/svg/north_arrows/NorthArrow2.svg,
-	images/svg/north_arrows/NorthArrow3.svg,
-	images/svg/north_arrows/NorthArrow4.svg,
-	images/svg/north_arrows/NorthArrow5.svg,
-	images/svg/north_arrows/NorthArrow6.svg, python/__init__.py,
-	python/console.py, python/plugins/fTools/frmAbout.ui,
-	python/plugins/fTools/ftools_help.xml,
-	python/plugins/fTools/ftools_help.xsl,
-	python/plugins/fTools/icons/menu_icons.svg,
-	python/plugins/fTools/resources.qrc,
-	python/plugins/fTools/tools/doMergeShapes.py,
-	python/plugins/fTools/tools/frmGeometry.ui,
-	python/plugins/fTools/tools/frmGeoprocessing.ui,
-	python/plugins/fTools/tools/frmIntersectLines.ui,
-	python/plugins/fTools/tools/frmJoinAttributes.ui,
-	python/plugins/fTools/tools/frmMeanCoords.ui,
-	python/plugins/fTools/tools/frmPointDistance.ui,
-	python/plugins/fTools/tools/frmPointsInPolygon.ui,
-	python/plugins/fTools/tools/frmRandPoints.ui,
-	python/plugins/fTools/tools/frmRandom.ui,
-	python/plugins/fTools/tools/frmReProject.ui,
-	python/plugins/fTools/tools/frmRegPoints.ui,
-	python/plugins/fTools/tools/frmSpatialJoin.ui,
-	python/plugins/fTools/tools/frmSubsetSelect.ui,
-	python/plugins/fTools/tools/frmSumLines.ui,
-	python/plugins/fTools/tools/frmVectorGrid.ui,
-	python/plugins/fTools/tools/frmVectorSplit.ui,
-	python/plugins/fTools/tools/frmVisual.ui,
-	python/plugins/fTools/tools/voronoi.py,
-	python/plugins/mapserver_export/__init__.py,
-	python/plugins/mapserver_export/mapserverexport.py,
-	python/plugins/mapserver_export/mapserverexportdialog.py,
-	python/plugins/mapserver_export/ms_export.py,
-	python/plugins/osm/OsmDatabaseManager.py,
-	python/plugins/osm/OsmFeatureDW.py,
-	python/plugins/osm/OsmImportDlg.py,
-	python/plugins/osm/OsmLoadDlg.py, python/plugins/osm/OsmPlugin.py,
-	python/plugins/osm/OsmSaveDlg.py, python/plugins/osm/OsmTags.py,
-	python/plugins/osm/OsmUndoRedoDW.py,
-	python/plugins/osm/__init__.py,
-	python/plugins/osm/map_tools/OsmCreateLineMT.py,
-	python/plugins/osm/map_tools/OsmCreatePointMT.py,
-	python/plugins/osm/map_tools/OsmCreatePolygonMT.py,
-	python/plugins/osm/map_tools/OsmIdentifyMT.py,
-	python/plugins/osm/map_tools/OsmMoveMT.py,
-	python/plugins/osm/map_tools/__init__.py,
-	python/plugins/osm/ui_files/OsmAddRelationDlg.ui,
-	python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py,
-	python/plugins/plugin_installer/version_compare.py,
-	python/utils.py, scripts/fixdiff.pl, scripts/qgm2cpp.pl,
-	scripts/ts2cpp.pl, src/app/legend/qgslegend.cpp,
-	src/app/legend/qgslegend.h, src/app/qgsannotationwidget.cpp,
-	src/app/qgsannotationwidget.h, src/app/qgsmaptoolannotation.cpp,
-	src/app/qgsmaptoolannotation.h,
-	src/app/qgstextannotationdialog.cpp,
-	src/app/qgstextannotationdialog.h,
-	src/core/composer/qgscomposershape.cpp,
-	src/core/composer/qgscomposershape.h,
-	src/core/gps/qextserialport/qwineventnotifier.h,
-	src/core/qgscredentials.cpp, src/core/qgscredentials.h,
-	src/gui/qgsannotationitem.cpp, src/gui/qgsannotationitem.h,
-	src/gui/qgscredentialdialog.cpp, src/gui/qgscredentialdialog.h,
-	src/gui/qgstextannotationitem.cpp, src/gui/qgstextannotationitem.h,
-	src/plugins/grass/modules-6.4/db.out.ogr.qgm,
-	src/plugins/grass/modules-6.4/r.bilinear.qgm,
-	src/plugins/grass/modules-6.4/r.colors.stddev.qgm,
-	src/plugins/grass/modules-6.4/r.grow.distance.qgm,
-	src/plugins/grass/modules-6.4/v.in.geonames.qgm,
-	src/plugins/grass/modules-6.4/v.in.gns.qgm,
-	src/plugins/grass/modules-common/db.copy.qgm,
-	src/plugins/grass/modules-common/r.circle.qgm,
-	src/plugins/grass/modules-common/r.in.bin.qgm,
-	src/plugins/grass/modules-common/r.in.wms.qgm,
-	src/plugins/grass/modules-common/r.in.xyz.qgm,
-	src/plugins/grass/modules-common/r.out.ascii.qgm,
-	src/plugins/grass/modules-common/r.out.gdal.qgm,
-	src/plugins/grass/modules-common/r.out.mpeg.qgm,
-	src/plugins/grass/modules-common/r.out.vtk.qgm,
-	src/plugins/grass/modules-common/r.plane.qgm,
-	src/plugins/grass/modules-common/r.sunmask.date.time.qgm,
-	src/plugins/grass/modules-common/r.sunmask.position.qgm,
-	src/plugins/grass/modules-common/v.net.1.svg,
-	src/plugins/grass/modules-common/v.net.2.svg,
-	src/plugins/grass/modules-common/v.net.path.1.svg,
-	src/plugins/grass/modules-common/v.net.path.2.svg,
-	src/plugins/grass/modules-common/v.net.path.qgm,
-	src/plugins/grass/modules-common/v.net.qgm,
-	src/plugins/grass/modules-common/v.net.visibility.1.svg,
-	src/plugins/grass/modules-common/v.net.visibility.2.svg,
-	src/plugins/grass/modules-common/v.net.visibility.qgm,
-	src/plugins/grass/modules-common/v.out.pov.2.svg,
-	src/plugins/grass/modules-common/v.out.pov.qgm,
-	src/plugins/grass/modules-common/v.out.svg.2.svg,
-	src/plugins/grass/modules-common/v.out.svg.qgm,
-	src/plugins/grass/modules-common/v.out.vtk.2.svg,
-	src/plugins/grass/modules-common/v.out.vtk.qgm,
-	src/plugins/grass/modules-common/v.perturb.qgm,
-	tests/src/core/runtests.sh: update permissions git-svn-id: http://svn.osgeo.org/qgis/trunk@13463
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: fix ssl preprocessor logic git-svn-id: http://svn.osgeo.org/qgis/trunk@13462
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  jef 
-
-	* python/core/qgsnetworkaccessmanager.sip, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/core/qgsnetworkaccessmanager.h: fix signal
-	signature of QgsNetworkAccessManager::requestAboutToBeCreated git-svn-id: http://svn.osgeo.org/qgis/trunk@13461
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  mhugent 
-
-	* src/app/legend/qgslegendlayer.cpp: append kml extension
-	automatically for easier interoperability with GE git-svn-id: http://svn.osgeo.org/qgis/trunk@13460
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  mhugent 
-
-	* src/app/qgsconfigureshortcutsdialog.cpp,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/plugins/spit/qgsspit.cpp, src/providers/ogr/qgsogrprovider.cpp: 
-	Consider also files without extensions in the file dialog filters git-svn-id: http://svn.osgeo.org/qgis/trunk@13459
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  macho 
-
-	* i18n/qgis_cs_CZ.ts: translation update: cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13458
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  mhugent 
-
-	* src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.h: Add gpl headers for
-	residual plot item git-svn-id: http://svn.osgeo.org/qgis/trunk@13457
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  mhugent 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp: Changed georef
-	pdf report layout and font sizes to address bug #2698 git-svn-id: http://svn.osgeo.org/qgis/trunk@13456
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  macho 
-
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13455
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-10  macho 
-
-	* i18n/qgis_el_GR.ts: translation update: el_GR by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13454
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-09  jef 
-
-	* python/core/qgsnetworkaccessmanager.sip,
-	src/core/qgsnetworkaccessmanager.cpp,
-	src/core/qgsnetworkaccessmanager.h: emit signals before and after
-	QgsNetworkAccessManager creates requests git-svn-id: http://svn.osgeo.org/qgis/trunk@13453
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-09  jef 
-
-	* debian/python-qgis.symbols.in,
-	debian/qgis-plugin-grass.symbols.in: missed files in r13438 git-svn-id: http://svn.osgeo.org/qgis/trunk@13452
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-09  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: network updates (r13443) git-svn-id: http://svn.osgeo.org/qgis/trunk@13449
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-09  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: handle ssl errors git-svn-id: http://svn.osgeo.org/qgis/trunk@13448
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-09  jef 
-
-	* python/CMakeLists.txt, python/core/qgsnetworkaccessmanager.sip,
-	src/core/qgsnetworkaccessmanager.cpp,
-	src/core/qgsnetworkaccessmanager.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp: resolve Qt 4.5
-	dependency git-svn-id: http://svn.osgeo.org/qgis/trunk@13447
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-05-08  jef 
+Merge: 6d71876 1a7ccd0
+Victor Olaya 	2012-11-30
 
-	* python/core/core.sip, python/core/qgsnetworkaccessmanager.sip: fix
-	sip bindings git-svn-id: http://svn.osgeo.org/qgis/trunk@13446
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-05-08  jef 
+Giuseppe Sucameli 	2012-11-29
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.cpp: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@13445
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix crash adding features containing missing attributes (fix #6791)
 
-2010-05-08  jef 
+Etienne Tourigny 	2012-11-29
 
-	* python/core/core.sip, python/core/qgsnetworkaccessmanager.sip,
-	src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsnetworkproxyfactory.cpp,
-	src/app/qgsnetworkproxyfactory.h, src/app/qgsoptions.cpp,
-	src/app/qgswmssourceselect.cpp, src/core/CMakeLists.txt,
-	src/core/qgsnetworkaccessmanager.cpp,
-	src/core/qgsnetworkaccessmanager.h,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: network manager changes: - add QgsNetworkAccessManager to core as singleton - add support for multiple proxy factories - remove qgisNetworkAccessManager property hack - python bindings wms provider: - use QgsNetworkAccessManager - some precision changes git-svn-id: http://svn.osgeo.org/qgis/trunk@13443
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    browser: add Fast Scan option for directories, when activated its items will only be checked for extension, not content
 
-2010-05-08  jef 
+Etienne Tourigny 	2012-11-20
 
-	* src/app/qgsmaptoolannotation.cpp,
-	src/app/qgsmaptoolrotatepointsymbols.cpp,
-	src/app/qgsmaptoolsimplify.cpp: cosmetic changes git-svn-id: http://svn.osgeo.org/qgis/trunk@13442
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix legend refresh
 
-2010-05-08  jef 
+Etienne Tourigny 	2012-11-20
 
-	* src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: apply #2634 git-svn-id: http://svn.osgeo.org/qgis/trunk@13441
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    browser: fix mModel vs. mProxyModel index
 
-2010-05-08  kyngchaos 
+D'Hont René-Luc 	2012-11-29
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: georef residual plots
-	(r13436, r13437) git-svn-id: http://svn.osgeo.org/qgis/trunk@13440
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Intersect Filter capabilities
 
-2010-05-08  jef 
+D'Hont René-Luc 	2012-11-29
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptoolannotation.cpp,
-	src/app/qgsmaptoolrotatepointsymbols.cpp,
-	src/app/qgsmaptoolsimplify.cpp, src/app/qgsnetworkproxyfactory.cpp,
-	src/app/qgsnetworkproxyfactory.h,
-	src/plugins/grass/qtermwidget/TerminalDisplay.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/providers/wms/qgswmsprovider.cpp: revert debian unrelated part
-	from r13438 git-svn-id: http://svn.osgeo.org/qgis/trunk@13439
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    First CITE compatibility
 
-2010-05-08  jef 
+Giuseppe Sucameli 	2012-11-29
 
-	* debian/changelog, debian/libqgis{QGIS_ABI}.symbols,
-	scripts/spelling.dat, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptoolannotation.cpp,
-	src/app/qgsmaptoolrotatepointsymbols.cpp,
-	src/app/qgsmaptoolsimplify.cpp, src/app/qgsnetworkproxyfactory.cpp,
-	src/app/qgsnetworkproxyfactory.h,
-	src/plugins/grass/qtermwidget/TerminalDisplay.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/providers/wms/qgswmsprovider.cpp: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13438
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    dbmanager: avoid duplicate field error (fix #6279)
 
-2010-05-07  mmassing 
+Giuseppe Sucameli 	2012-11-28
 
-	* src/plugins/georeferencer/qgsresidualplotitem.cpp,
-	src/plugins/georeferencer/qgsresidualplotitem.h: Add missing files.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13437
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    dbmanager: fix #5812,
+    move PG informations to postgis/info_model.py
 
-2010-05-07  mmassing 
+Giuseppe Sucameli 	2012-11-28
 
-	* src/plugins/georeferencer/CMakeLists.txt,
-	src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.h,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui: Partial
-	patch #2673 by mhugent: -Configurable GCP labeling -Ability to generate PDF report of
-	residuals and transform parameters -Allow resampling to output file
-	even for linear transforms git-svn-id: http://svn.osgeo.org/qgis/trunk@13436
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    dbmanager: display info about missing modules on the info panel instead of on the status bar
 
-2010-05-07  jef 
+Giuseppe Sucameli 	2012-11-28
 
-	* debian/changelog, debian/control.hardy, debian/control.intrepid,
-	debian/control.jaunty, debian/control.karmic, debian/control.lenny,
-	debian/control.sid: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13435
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    create multipart layers whether the input is a singlepart shapefile (fix #5547)
 
-2010-05-07  wonder 
+Giuseppe Sucameli 	2012-11-28
 
-	* python/core/qgssearchtreenode.sip,
-	src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/qgssearchquerybuilder.cpp, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: Added the possibility to use $area,
-	$length when searching in attribute table.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13434
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    dbmanager: use a default value for varchar limit (follow a4484b217ed)
 
-2010-05-07  wonder 
+Larry Shaffer 	2012-11-28
 
-	* python/core/qgssearchtreenode.sip,
-	src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: Added
-	optional geometry parameter when evaluating predicates git-svn-id: http://svn.osgeo.org/qgis/trunk@13433
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update QgsLegend::selectedLayers() and add to QgsLegendInterface
+    
+    - Add option to return selected layers in drawing order
 
-2010-05-06  jef 
+Merge: a448f6a a4484b2
+Magnus Homann 	2012-11-28
 
-	* src/app/qgsoptions.cpp: fix url exclusion changes git-svn-id: http://svn.osgeo.org/qgis/trunk@13432
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into qgsexpression_DA
 
-2010-05-06  jef 
+Giuseppe Sucameli 	2012-11-28
 
-	* src/plugins/grass/qgsgrassmodule.cpp: fix #2620 git-svn-id: http://svn.osgeo.org/qgis/trunk@13431
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    dbmanager: fix #6511
 
-2010-05-06  jef 
+Giuseppe Sucameli 	2012-11-28
 
-	* debian/changelog, debian/qgis-plugin-grass.install.in: include
-	qgis.g.browser in debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@13430
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6777
 
-2010-05-06  jef 
+Nathan Woodrow 	2012-11-28
 
-	* src/app/CMakeLists.txt: make spatialite optional again git-svn-id: http://svn.osgeo.org/qgis/trunk@13429
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6764 again.  Replace backslash for python code only
 
-2010-05-06  pcav 
+Nathan Woodrow 	2012-11-28
 
-	* i18n/qgis_it.ts: Fixed typos in IT transaltion git-svn-id: http://svn.osgeo.org/qgis/trunk@13428
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6764
 
-2010-05-06  pcav 
+Merge: c989673 ee12df2
+Tim Sutton 	2012-11-28
 
-	* src/plugins/grass/modules-common/r.sunmask.date.time.qgm: Fixed
-	r.sunmask.date.time. Thanks Markus Neteler git-svn-id: http://svn.osgeo.org/qgis/trunk@13427
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Rebase failed - merging branch 'master' of github.com:qgis/Quantum-GIS
 
-2010-05-05  pcav 
+Tim Sutton 	2012-11-28
 
-	* i18n/qgis_it.ts: Translation of the IT GUI - Thanks to Flavio
-	Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@13426
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Test improvements - moved writeShape to utilities for DRY. Added clip test to geometry python tests.
 
-2010-05-05  wonder 
+Victor Olaya 	2012-11-28
 
-	* src/providers/gpx/qgsgpxprovider.cpp,
-	src/providers/osm/osmprovider.cpp: Fixed CRS for OSM and GPX
-	providers. Should fix #2661.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13425
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixed some minor bugs in sextante algs
+    Removed SAGA Split algorithms
 
-2010-05-05  jef 
+Larry Shaffer 	2012-11-27
 
-	* src/providers/postgres/qgspostgresprovider.cpp: minor pg provider
-	fix: oid==0 is invalid git-svn-id: http://svn.osgeo.org/qgis/trunk@13424
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add option to set inside and outside maximum for delta angle between curved label characters
+    
+    - Addresses #6763, #6673 and #2113, but does not perform any feature simplification
+    - Recommend adding some letter [and word] spacing before applying any delta angle adjustment
 
-2010-05-05  wonder 
+Larry Shaffer 	2012-11-27
 
-	* src/core/symbology-ng/qgssymbolv2.cpp: Fixed #2615.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13423
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add access to QgisApp's mActionCopyStyle and mActionPasteStyle to QgisInterface
 
-2010-05-04  wonder 
+Giuseppe Sucameli 	2012-11-27
 
-	* python/console.py: More portable selection of monospaced font git-svn-id: http://svn.osgeo.org/qgis/trunk@13422
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6769
 
-2010-05-04  wonder 
+Giuseppe Sucameli 	2012-11-27
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2.h: MarkerLine symbol layer:
-	fixed usage with map units, set minimal interval to avoid infinite
-	loop, simpler markerline symbol handling.  Developed for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA]".  For the project: "Sviluppo di
-	prodotti software GIS open-source basati sui prodotti QuantumGIS e
-	Postgis (CIG 037728516E)" git-svn-id: http://svn.osgeo.org/qgis/trunk@13421
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build with Qt < 4.8
 
-2010-05-04  wonder 
+Giuseppe Sucameli 	2012-11-27
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp: MarkerLine symbol
-	layer widget: Fixed handling of floating point marker intervals git-svn-id: http://svn.osgeo.org/qgis/trunk@13420
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix qgis-server crash moving QCursor to the GUI classes (follow 454c732a3)
 
-2010-05-04  wonder 
+Marco Hugentobler 	2012-11-27
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h: SimpleMarker symbol
-	layer: do not cache marker symbol if the vector output is enforced,
-	fixed scaling git-svn-id: http://svn.osgeo.org/qgis/trunk@13419
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consider alpha value for annotation rectangle in QGIS server
 
-2010-05-04  wonder 
+Salvatore Larosa 	2012-11-27
 
-	* python/core/qgsrendercontext.sip,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/qgsrendercontext.cpp, src/core/qgsrendercontext.h: Do not
-	force vector output by default (use only in composer map), enable
-	setting of the flag git-svn-id: http://svn.osgeo.org/qgis/trunk@13418
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix for #6749 and #6278
 
-2010-05-03  wonder 
+Merge: a757935 4cfdba4
+Alexander Bruy 	2012-11-27
 
-	* python/core/qgsvectorlayer.sip: PyQGIS: added missing annotation git-svn-id: http://svn.osgeo.org/qgis/trunk@13417
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'identify_improvements'
 
-2010-05-03  wonder 
+Alexander Bruy 	2012-11-22
 
-	* python/core/symbology-ng-core.sip: PyQGIS: Fixed wrappers for
-	symbology-ng renderers (were claimed to be abstract classes) git-svn-id: http://svn.osgeo.org/qgis/trunk@13416
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    put back to derived attrs clicked coordinates
 
-2010-05-03  jef 
+Alexander Bruy 	2012-11-22
 
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13415
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add perimeter to derived attributes for polygonal geometries
 
-2010-05-03  pcav 
+Juergen E. Fischer 	2012-11-27
 
-	* src/plugins/grass/modules-common/v.generalize.qgm: Fixed
-	v.generalize, adding copy of attributes git-svn-id: http://svn.osgeo.org/qgis/trunk@13414
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build with Qt<4.8 and some doxygen warnings
 
-2010-05-02  macho 
+Giuseppe Sucameli 	2012-11-27
 
-	* i18n/qgis_cs_CZ.ts: translation update: CZ from Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13413
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] add support to SVG images from url.
+    
+    Work done for Regione Toscana-SITA
 
-2010-04-30  borysiasty 
+Merge: 6e24c16 b54c3bf
+Giuseppe Sucameli 	2012-11-26
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h: Fix missing
-	actions. Patch #2686 by christophgysin + sip bindings.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13412
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #340 from slarosa/master
+    
+    Changed import sextante class entry according to 6173fa3 (PyQGIS Console)
 
-2010-04-30  macho 
+Matthias Kuhn 	2012-11-14
 
-	* i18n/qgis_fr.ts: translation update: fr by Jean Roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13411
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add some comments
 
-2010-04-30  borysiasty 
+Matthias Kuhn 	2012-11-14
 
-	* src/app/qgisapp.cpp: fix edit actions remaining active when
-	switching to a raster layer git-svn-id: http://svn.osgeo.org/qgis/trunk@13410
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    SIP bindings for point rubberband.
 
-2010-04-29  wonder 
+Matthias Kuhn 	2012-11-14
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fixed resizing
-	of font marker when units are map units.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13409
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Extend QgsRubberBand to support points.
 
-2010-04-29  wonder 
+Salvatore Larosa 	2012-11-26
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/widget_simplefill.ui: [FEATURE] symbology-ng:
-	possibility to offset for simple fill.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13408
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changed import sextante class entry according to 6173fa3
 
-2010-04-29  macho 
+Merge: 4dc85e4 6e24c16
+Magnus Homann 	2012-11-26
 
-	* i18n/qgis_cs_CZ.ts, i18n/qgis_fr.ts: translation update: fr by
-	Jean Roc and cs_CZ by Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13407
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' into qgsexpression_DA
 
-2010-04-28  jef 
+Magnus Homann 	2012-11-26
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix #2681 git-svn-id: http://svn.osgeo.org/qgis/trunk@13406
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Removed ellipsoid settings from QgsOptions
 
-2010-04-27  macho 
+Merge: afeb497 f1ab2db
+Werner Macho 	2012-11-26
 
-	* i18n/qgis_cs_CZ.ts, i18n/qgis_fi.ts: translation update: fi from
-	Marko and CZ from Jan git-svn-id: http://svn.osgeo.org/qgis/trunk@13405
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #339 from kimaidou/myqgis
+    
+    Correct french translation of print composer legend properties
 
-2010-04-27  jef 
+Michael Douchin 	2012-11-26
 
-	* src/providers/postgres/qgspostgresprovider.cpp: fix #2680 git-svn-id: http://svn.osgeo.org/qgis/trunk@13404
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Correct french translation of print composer legend properties
 
-2010-04-27  ersts 
+D'Hont René-Luc 	2012-11-26
 
-	* src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp: 
-	-Removed spaces from connection string for MS Access files that may
-	be cause the connection on windows to fail git-svn-id: http://svn.osgeo.org/qgis/trunk@13402
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Replace OnlineResource by onlineResource
 
-2010-04-27  jef 
+D'Hont René-Luc 	2012-11-26
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts, python/plugins/fTools/doAbout.py,
-	python/plugins/fTools/ftools_help.xsl,
-	python/plugins/fTools/tools/doGeoprocessing.py: fix typos git-svn-id: http://svn.osgeo.org/qgis/trunk@13401
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QGIS Server WFS Capabilities schemaLocation updated
 
-2010-04-26  kyngchaos 
+Werner Macho 	2012-11-26
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: bundling: QtWebKit 4.6 needs
-	QtXmlPatterns git-svn-id: http://svn.osgeo.org/qgis/trunk@13399
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: small changes in vector menu
 
-2010-04-26  jef 
+Alexander Bruy 	2012-11-26
 
-	* python/plugins/fTools/tools/doSpatialJoin.py: fix runtime error in
-	fTools' spatial join git-svn-id: http://svn.osgeo.org/qgis/trunk@13398
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Possibility to save error messages as shapefile from check
+    geometry validity tool. Contributed by Salvatore Larosa
 
-2010-04-26  jef 
+Merge: 9f71d9f 838864f
+Werner Macho 	2012-11-26
 
-	* src/core/qgsproject.cpp: fix relative paths, when project is on
-	unc path git-svn-id: http://svn.osgeo.org/qgis/trunk@13397
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #335 from giohappy/master
+    
+    projectSaved SIGNAL added to QgsProject
 
-2010-04-26  jef 
+Merge: a0c8b5c 755707d
+Werner Macho 	2012-11-25
 
-	* python/core/symbology-ng-core.sip: fix sip 4.7 support git-svn-id: http://svn.osgeo.org/qgis/trunk@13395
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #338 from simon04/too_many_classes
+    
+    Abort classification upon high number of classes
 
-2010-04-26  jef 
+Juergen E. Fischer 	2012-11-25
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13394
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    t2t fixes
 
-2010-04-26  jef 
+Magnus Homann 	2012-11-25
 
-	* src/app/qgisapp.cpp: ignore '&' when ordering the plugin menu git-svn-id: http://svn.osgeo.org/qgis/trunk@13393
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-26  jef 
-
-	* src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsspatialitesridsdialog.cpp: fix crash in spatialite srid
-	selection on creation git-svn-id: http://svn.osgeo.org/qgis/trunk@13392
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-26  jef 
-
-	* cmake/SIPMacros.cmake, scripts/spelling.dat,
-	src/analysis/vector/qgszonalstatistics.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/providers/grass/qgsgrassrasterprovider.cpp: fix common typos git-svn-id: http://svn.osgeo.org/qgis/trunk@13391
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  wonder 
-
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.h,
-	src/core/symbology-ng/qgssymbolv2.h: Added notes to newly added
-	methods git-svn-id: http://svn.osgeo.org/qgis/trunk@13390
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  wonder 
-
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/ui/qgssymbolv2selectordialogbase.ui: [FEATURE] Data-defined size
-	and rotation for single symbol renderer in symbology-ng. (ticket
-	#2585) Developed by for Faunalia (http://www.faunalia.it) with funding from
-	Regione Toscana - Sistema Informativo per la Gestione del Territorio
-	e dell' Ambiente [RT-SIGTA]".  For the project: "Sviluppo di
-	prodotti software GIS open-source basati sui prodotti QuantumGIS e
-	Postgis (CIG 037728516E) git-svn-id: http://svn.osgeo.org/qgis/trunk@13389
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  timlinux 
-
-	* CONTRIBUTORS: Alphabetised contributors list and added Luiz Motta
-	and Diego Moreira (authors of spatial query plugin) git-svn-id: http://svn.osgeo.org/qgis/trunk@13388
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  macho 
-
-	* i18n/qgis_el_GR.ts: translation update: el_GR by Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13385
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  wonder 
-
-	* python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/gui/qgslegendinterface.h: Applied patch from #2672 by Andres
-	Manz: more legend interface functionality.  Thanks for contributing.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13383
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: more spatial query
-	cleanup (r13367) lupdate fixes (r13370) git-svn-id: http://svn.osgeo.org/qgis/trunk@13382
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui: fix
-	spatialquery combobox resizing issue git-svn-id: http://svn.osgeo.org/qgis/trunk@13381
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* src/analysis/interpolation/DualEdgeTriangulation.cc,
-	src/analysis/interpolation/MathUtils.cc,
-	src/analysis/interpolation/NormVecDecorator.cc,
-	src/analysis/raster/qgsninecellfilter.cpp,
-	src/app/composer/qgscomposerpicturewidget.cpp,
-	src/app/legend/qgslegendlayer.cpp, src/app/legend/qgslegendlayer.h,
-	src/app/main.cpp, src/app/ogr/qgsnewogrconnection.cpp,
-	src/app/qgisapp.cpp, src/app/qgsgraduatedsymboldialog.cpp,
-	src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolselect.cpp,
-	src/app/qgsmaptoolsimplify.cpp, src/app/qgsmaptoolsimplify.h,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgssinglesymboldialog.cpp,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/app/qgswmssourceselect.h, src/core/pal/simplemutex.h,
-	src/core/pal/util.h, src/core/qgsapplication.h,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsdistancearea.cpp, src/core/qgsgeometry.cpp,
-	src/core/qgsgeometry.h, src/core/qgshttptransaction.cpp,
-	src/core/qgshttptransaction.h, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayerregistry.h, src/core/qgsmaprenderer.cpp,
-	src/core/qgsmaprenderer.h, src/core/qgspluginlayerregistry.h,
-	src/core/qgsproject.h, src/core/qgsrectangle.cpp,
-	src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorfilewriter.cpp,
-	src/core/qgsvectorfilewriter.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/raster/qgsrasterlayer.cpp,
-	src/core/spatialindex/rtree/RTree.cc,
-	src/core/spatialindex/storagemanager/Buffer.cc,
-	src/core/spatialindex/storagemanager/DiskStorageManager.cc,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/gui/qgsmapcanvas.cpp, src/gui/qgsmapcanvas.h,
-	src/gui/qgsmaptoolpan.cpp,
-	src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp,
-	src/plugins/evis/eventbrowser/evisconfiguration.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/grass/qgsgrassattributes.cpp,
-	src/plugins/grass/qgsgrassbrowser.cpp,
-	src/plugins/grass/qgsgrassmapcalc.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.
-	cpp, src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spit/qgsshapefile.cpp, src/plugins/spit/qgsspit.cpp,
-	src/plugins/wfs/qgswfssourceselect.cpp,
-	src/providers/grass/qgsgrass.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: some cleanups: - macros TRUE/FALSE to keywords true/false - replace boolean comparison (x==true => x / x==false => !x) - return(x); => return x; git-svn-id: http://svn.osgeo.org/qgis/trunk@13380
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* src/providers/memory/qgsmemoryprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.cpp: also set feature
-	validity in featureAtId of memory and spatialite provider git-svn-id: http://svn.osgeo.org/qgis/trunk@13379
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* i18n/qgis_de.ts,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp: translation fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@13378
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h: spatial query:
-	cosmetic changes and set svn keywords git-svn-id: http://svn.osgeo.org/qgis/trunk@13377
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-25  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: set feature
-	validity in QgsPostgresProvider::featureAtIt git-svn-id: http://svn.osgeo.org/qgis/trunk@13376
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	fix error handling git-svn-id: http://svn.osgeo.org/qgis/trunk@13375
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: postgres provider:
-	improve error handling git-svn-id: http://svn.osgeo.org/qgis/trunk@13374
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/core/qgsgeometry.cpp, src/core/qgsgeometry.h: fix windows
-	build git-svn-id: http://svn.osgeo.org/qgis/trunk@13373
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* python/core/qgsgeometry.sip, src/core/qgsgeometry.h,
-	src/plugins/spatialquery/CMakeLists.txt: missed python binding to
-	additional GEOS operators git-svn-id: http://svn.osgeo.org/qgis/trunk@13372
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp: 
-	remove Qt 4.5 dependency git-svn-id: http://svn.osgeo.org/qgis/trunk@13371
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* scripts/qgm2cpp.pl, scripts/update_ts_files.sh,
-	src/app/CMakeLists.txt,
-	src/app/attributetable/qgsattributetableview.h,
-	src/app/composer/qgscomposermanager.cpp, src/app/qgsdisplayangle.h,
-	src/app/qgsmaptoolreshape.h,
-	src/app/qgsmaptoolrotatepointsymbols.h, src/gui/CMakeLists.txt,
-	src/gui/qgscredentialdialog.h,
-	src/gui/symbology-ng/qgspenstylecombobox.h,
-	src/plugins/evis/databaseconnection/evisdatabaseconnection.h,
-	src/plugins/grass/qgsgrassedit.cpp,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgsgrassprovider.h,
-	src/providers/memory/CMakeLists.txt,
-	src/providers/memory/qgsmemoryprovider.h: make update_ts_files.sh
-	less noisy and a bit more failsafe and fix a bunch or lupdate
-	warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13370
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13369
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* i18n/qgis_pt_BR.ts: integrate spatial query plugin translations git-svn-id: http://svn.osgeo.org/qgis/trunk@13368
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/plugins/spatialquery/CMakeLists.txt,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/plugins/spatialquery/ts/spatialquery_pt_BR.ts: spatial query
-	plugin: port to new QgsGeometry operators, gui cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13367
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/core/spatialindex/include/PoolPointer.h: [FEATURE] support more
-	GEOS operators git-svn-id: http://svn.osgeo.org/qgis/trunk@13366
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: spatial query cleanup
-	(r13360) git-svn-id: http://svn.osgeo.org/qgis/trunk@13365
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  timlinux 
-
-	* src/plugins/spatialquery/CMakeLists.txt: Added geos to include
-	search path and library linking for geos git-svn-id: http://svn.osgeo.org/qgis/trunk@13364
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/plugins/spatialquery/qgsspatialquery.cpp: fix crash introduced
-	in r13360 git-svn-id: http://svn.osgeo.org/qgis/trunk@13362
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  wonder 
-
-	* python/gui/qgscomposerview.sip: PyQGIS: added subclassing code for
-	QgsComposerView git-svn-id: http://svn.osgeo.org/qgis/trunk@13361
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* debian/changelog, debian/qgis.install, debian/rules,
-	src/plugins/spatialquery/CMakeLists.txt,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h: spatial query
-	plugin: fix warnings, reindent, include in debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@13360
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  jef 
-
-	* src/plugins/spit/qgsshapefile.cpp: implement #2676 git-svn-id: http://svn.osgeo.org/qgis/trunk@13359
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-24  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: spatial selection plugin
-	(r13356) git-svn-id: http://svn.osgeo.org/qgis/trunk@13358
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-23  timlinux 
-
-	* doc/CODING.t2t: Added note about using Qt style includes git-svn-id: http://svn.osgeo.org/qgis/trunk@13357
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-23  timlinux 
-
-	* src/plugins/CMakeLists.txt,
-	src/plugins/spatialquery/CMakeLists.txt,
-	src/plugins/spatialquery/README,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp,
-	src/plugins/spatialquery/qgsgeometrycoordinatetransform.h,
-	src/plugins/spatialquery/qgsmngprogressbar.cpp,
-	src/plugins/spatialquery/qgsmngprogressbar.h,
-	src/plugins/spatialquery/qgsreaderfeatures.cpp,
-	src/plugins/spatialquery/qgsreaderfeatures.h,
-	src/plugins/spatialquery/qgsrubberselectid.cpp,
-	src/plugins/spatialquery/qgsrubberselectid.h,
-	src/plugins/spatialquery/qgsspatialquery.cpp,
-	src/plugins/spatialquery/qgsspatialquery.h,
-	src/plugins/spatialquery/qgsspatialquerydialog.cpp,
-	src/plugins/spatialquery/qgsspatialquerydialog.h,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.qrc,
-	src/plugins/spatialquery/qgsspatialquerydialogbase.ui,
-	src/plugins/spatialquery/qgsspatialqueryplugin.cpp,
-	src/plugins/spatialquery/qgsspatialqueryplugin.h,
-	src/plugins/spatialquery/ts/spatialquery_pt_BR.ts: [FEATURE] Applied
-	patch #2634 from Luiz  Motta which provide a new c++ plugin for
-	carrying out spatial selections git-svn-id: http://svn.osgeo.org/qgis/trunk@13356
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Changed to QgsProject also in qgscompersscalebar
 
-2010-04-23  jef 
+Simon Legner 	2012-11-25
 
-	* src/app/qgsmaptoolnodetool.cpp: fix #2675 git-svn-id: http://svn.osgeo.org/qgis/trunk@13355
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Abort classification upon high number of classes
 
-2010-04-23  mhugent 
+Magnus Homann 	2012-11-25
 
-	*
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h: Fix point displacement renderer to work with the new selection
-	parameter git-svn-id: http://svn.osgeo.org/qgis/trunk@13354
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Using QgsProject settings instead, not fully tested
 
-2010-04-23  wonder 
+Magnus Homann 	2012-11-24
 
-	* python/core/qgsapplication.sip, python/core/symbology-ng-core.sip: 
-	Added python wrappers from QgsSymbolLayerV2Utils git-svn-id: http://svn.osgeo.org/qgis/trunk@13353
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Copied ellipsoidal settings to project properties
 
-2010-04-23  wonder 
+Merge: 21370d9 b60a00f
+Werner Macho 	2012-11-23
 
-	* src/core/qgsapplication.cpp, src/core/qgsapplication.h,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: Added
-	QgsApplication::iconPath utility function (and removed its
-	declaration from QgsSymbolLayerV2Utils) git-svn-id: http://svn.osgeo.org/qgis/trunk@13352
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #337 from gioman/master
+    
+    PT_PT translations courtesy of Pedro Palheiro
 
-2010-04-23  wonder 
+Larry Shaffer 	2012-11-20
 
-	* python/core/qgssearchtreenode.sip,
-	src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: Added
-	QgsSearchTreeNode::referencedColumns() utility function.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13351
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add extra check on project close for any layer in edit mode with unsaved edits
+    
+    - Ensures user has opportunity to save provider edits
+    - Make project dirty if any unsaved edits found
+    - Add red notification to project save prompt dialog, and set Cancel to default
+    - Fix for #6054 and #6732
 
-2010-04-23  wonder 
+Merge: 1f1448d 7f8768a
+Magnus Homann 	2012-11-23
 
-	* src/core/symbology-ng/qgsrendererv2.cpp: Fixed rendering of
-	selection for multipolygons (symbology-ng) git-svn-id: http://svn.osgeo.org/qgis/trunk@13350
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update from master
 
-2010-04-22  cfarmer 
+Vânia Neves 	2012-11-23
 
-	* python/plugins/fTools/tools/doGeoprocessing.py: Checks for long
-	field names and warns when this will be a problem. Patch from Alex.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13348
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    PT_PT translations courtesy of Pedro Palheiro
 
-2010-04-22  cfarmer 
+Merge: e5dae02 dd1d4b5
+Marco Hugentobler 	2012-11-23
 
-	* python/plugins/fTools/tools/doVisual.py,
-	python/plugins/fTools/tools/frmVisual.ui: fixes copy and pasting of
-	results from several analysis tools. Patch from Alex.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13347
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'wms_layer_opacity'
 
-2010-04-22  wonder 
+Marco Hugentobler 	2012-11-23
 
-	* src/core/qgsvectordataprovider.h, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h: Marked updateFeatureCount() in
-	QgsVectorLayer and QgsVectorDataProvider as meaningless functions.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13346
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Small cleanup
 
-2010-04-22  wonder 
+Marco Hugentobler 	2012-11-23
 
-	* src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/ogr/qgsogrprovider.h: Fix calculation of feature count
-	in OGR provider (FeatureCount function works with current spatial
-	filter) git-svn-id: http://svn.osgeo.org/qgis/trunk@13345
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use lists for opacity params inside wms server
 
-2010-04-22  mhugent 
+Nathan Woodrow 	2012-11-24
 
-	* src/gui/qgsmaptoolpan.cpp, src/gui/qgsmaptoolpan.h: Remove
-	canvasPressEvent in cpp and header (forgot to commit the header
-	yesterday) git-svn-id: http://svn.osgeo.org/qgis/trunk@13344
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add CLI option for customization file
 
-2010-04-22  jef 
+Marco Hugentobler 	2012-11-23
 
-	* src/gui/qgsmaptoolpan.cpp: fix windows link error git-svn-id: http://svn.osgeo.org/qgis/trunk@13343
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Also support layer transparency in server for old symbology
 
-2010-04-21  mhugent 
+Marco Hugentobler 	2012-11-23
 
-	* src/gui/qgsmaptoolpan.cpp: [FEATURE]: center map if user clicks
-	into the map (patch 2278 provided by smizuno) git-svn-id: http://svn.osgeo.org/qgis/trunk@13342
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE]: wms server has possibility to set transparency on layer/group level
 
-2010-04-21  kyngchaos 
+Marco Hugentobler 	2012-11-23
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help update
-	(r13337) git-svn-id: http://svn.osgeo.org/qgis/trunk@13341
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove double content from wmsserver (probably a merging artifact)
 
-2010-04-20  jef 
+Giuseppe Sucameli 	2012-11-23
 
-	* CONTRIBUTORS, src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: apply #2662. Thanks
-	Giuseppe.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13340
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build
 
-2010-04-20  jef 
+Marco Hugentobler 	2012-11-22
 
-	* src/app/qgsattributedialog.cpp: set attribute dialog parent and
-	save geometry git-svn-id: http://svn.osgeo.org/qgis/trunk@13339
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Keep legend drawing order as default
 
-2010-04-20  jef 
+Marco Hugentobler 	2012-11-22
 
-	* src/app/qgisapp.h: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@13338
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Server: fix layer order in GetProjectSettings request
 
-2010-04-20  jef 
+Tim Sutton 	2012-11-22
 
-	* resources/context_help/QgsNewSpatialiteLayerDialog-de_DE,
-	resources/context_help/QgsNewSpatialiteLayerDialog-en_US,
-	src/app/qgisapp.cpp, src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h,
-	src/ui/qgsnewspatialitelayerdialogbase.ui: allow creation of
-	multiple layers in spatialite creation dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@13337
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove expectedFailure decorator for vector file writer test. Small doc updates for vfile writer
 
-2010-04-20  jef 
+Tim Sutton 	2012-11-22
 
-	* src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h: 
-	improve database uri quoting (eg. for table names with quotes) git-svn-id: http://svn.osgeo.org/qgis/trunk@13336
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ../src/core/qgsvectorfilewriter.h
 
-2010-04-20  wonder 
+Tim Sutton 	2012-11-22
 
-	* src/gui/symbology-ng/qgsstylev2managerdialog.cpp,
-	src/gui/symbology-ng/qgsstylev2managerdialog.h: save style when
-	closing style manager only if it was modified git-svn-id: http://svn.osgeo.org/qgis/trunk@13335
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better annotation of vector file writer api changes
 
-2010-04-20  wonder 
+Larry Shaffer 	2012-11-21
 
-	* src/providers/memory/qgsmemoryprovider.cpp: added description of
-	native types to memory provider (to allow adding columns in GUI) git-svn-id: http://svn.osgeo.org/qgis/trunk@13334
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Pass path to Qt plugins when Mac bundle is run from build directory
 
-2010-04-20  wonder 
+Larry Shaffer 	2012-11-21
 
-	* python/core/conversions.sip, python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsvectorcolorrampv2.cpp,
-	src/core/symbology-ng/qgsvectorcolorrampv2.h,
-	src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp,
-	src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h,
-	src/ui/qgsvectorgradientcolorrampv2dialogbase.ui: [FEATURE] gradient
-	color ramps now support multiple stops - for adding intermediate
-	colors git-svn-id: http://svn.osgeo.org/qgis/trunk@13333
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better fix for QgsVectorFileWriter segfault and test
+    
+    - Revert test to 735c255 commit, excepting 'assert myResult==QgsVectorFileWriter.NoError' edit
 
-2010-04-20  mhugent 
+Larry Shaffer 	2012-11-21
 
-	* python/gui/qgsmapcanvasitem.sip, src/gui/qgsannotationitem.cpp,
-	src/gui/qgsannotationitem.h, src/gui/qgsmapcanvasitem.cpp,
-	src/gui/qgsmapcanvasitem.h: Move setRenderContext() method to
-	mapcanvas item class git-svn-id: http://svn.osgeo.org/qgis/trunk@13332
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for PyQgsVectorFileWriter test segfault on Mac
+    
+    - Initialize newFilename to QString(), or QgsDebugMsg for newFilename segfaults (line 650)
+    - Set test assert to QgsVectorFileWriter::WriterError enum for success (NoError = 0, i.e. false)
 
-2010-04-20  mhugent 
+Larry Shaffer 	2012-11-21
 
-	* src/gui/qgscomposerview.cpp: Simplified composerView function git-svn-id: http://svn.osgeo.org/qgis/trunk@13331
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for quick left-then-right clicks incorrectly registering as double left on Mac
 
-2010-04-20  mhugent 
+Radim Blazek 	2012-11-21
 
-	* src/gui/qgsformannotationitem.cpp: Fix typo in last commit git-svn-id: http://svn.osgeo.org/qgis/trunk@13330
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend optional space between columns
 
-2010-04-20  mhugent 
+Radim Blazek 	2012-11-21
 
-	* src/gui/qgsformannotationitem.cpp: Consider frame width for
-	annotation item minimum size git-svn-id: http://svn.osgeo.org/qgis/trunk@13329
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer multicolumn legend: division to columns heuristic, optional splitting layers into multiple columns, optional equal column width
 
-2010-04-19  mhugent 
+giohappy 	2012-11-21
 
-	* python/core/qgscomposeritem.sip,
-	src/core/composer/qgscomposerarrow.cpp,
-	src/core/composer/qgscomposerarrow.h,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h: Move code to draw arrow head
-	from composer arrow to composer item git-svn-id: http://svn.osgeo.org/qgis/trunk@13328
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update src/core/qgsproject.h
+    
+    defined projectSaved() SIGNAL emitted when the project file has been written and closed
 
-2010-04-19  mhugent 
+giohappy 	2012-11-21
 
-	* src/core/composer/qgscomposerarrow.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.
-	cpp: Remove some debug code git-svn-id: http://svn.osgeo.org/qgis/trunk@13327
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update src/core/qgsproject.cpp
+    
+    emit projectSaved SIGNAL when the project file is saved and closed
 
-2010-04-19  mhugent 
+Merge: 0893db7 d673606
+Marco Hugentobler 	2012-11-21
 
-	* src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h: Possibility to adapt composer
-	table rect to content size before painting git-svn-id: http://svn.osgeo.org/qgis/trunk@13326
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'drawing_order_embedded'
 
-2010-04-18  wonder 
+Marco Hugentobler 	2012-11-21
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h: SVG fill widget:
-	don't require user to "activate" the svg item (by double clicking) -
-	apply new fill when current item is changed git-svn-id: http://svn.osgeo.org/qgis/trunk@13325
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Another fix for embedded groups and drawing order. Deactivated the server method for now as it still needs to be adapted
 
-2010-04-18  wonder 
+Victor Olaya 	2012-11-20
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp: In symbol
-	selector, omit decimals when displaying the transparency % git-svn-id: http://svn.osgeo.org/qgis/trunk@13324
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6737
 
-2010-04-18  wonder 
+Victor Olaya 	2012-11-20
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/ui/symbollayer/widget_simplemarker.ui: Fixed simple symbol
-	marker sizes in the symbol layer widget git-svn-id: http://svn.osgeo.org/qgis/trunk@13323
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6738
 
-2010-04-18  wonder 
+D'Hont René-Luc 	2012-11-20
 
-	* python/core/symbology-ng-core.sip, src/core/qgsvectorlayer.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.h,
-	src/core/symbology-ng/qgssymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h: Applied patch from #2640:
-	improved rendering of selected features (symbology-ng).  + fixed
-	font marker scaling for printing Contributed by Chris Crook. Thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@13322
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better WFS service exception management
 
-2010-04-16  jef 
+Marco Hugentobler 	2012-11-20
 
-	* src/gui/qgsmapcanvas.cpp: fix #2654, take III git-svn-id: http://svn.osgeo.org/qgis/trunk@13321
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    More drawing order related changes...
 
-2010-04-16  borysiasty 
+Marco Hugentobler 	2012-11-20
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13320
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Synchronize check states between legend and layer order widget
 
-2010-04-16  macho 
+Merge: cb07ae4 0533e2d
+Victor Olaya 	2012-11-20
 
-	* doc/index.html: fix wrong link in documentation git-svn-id: http://svn.osgeo.org/qgis/trunk@13319
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-04-16  kyngchaos 
+Marco Hugentobler 	2012-11-20
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: refactor composer table
-	(r13316) git-svn-id: http://svn.osgeo.org/qgis/trunk@13318
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement addDrawingOrder for wms server under consideration of embedded groups
 
-2010-04-16  mhugent 
+Victor Olaya 	2012-11-20
 
-	* python/gui/qgsformannotationitem.sip,
-	python/gui/qgstextannotationitem.sip: Add TransferThis to annotation
-	python constructors git-svn-id: http://svn.osgeo.org/qgis/trunk@13317
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    cleaned BatchProcessingDialog code
 
-2010-04-15  mhugent 
+Merge: bab4395 ddb5117
+mhugent 	2012-11-19
 
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h, src/core/CMakeLists.txt,
-	src/core/composer/qgscomposerattributetable.cpp,
-	src/core/composer/qgscomposerattributetable.h,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h,
-	src/core/composer/qgscomposertexttable.cpp,
-	src/core/composer/qgscomposertexttable.h,
-	src/gui/qgscomposerview.cpp, src/gui/qgscomposerview.h: Refactor
-	composer table to a base class that has vector attribute table and
-	normal text table as subclasses git-svn-id: http://svn.osgeo.org/qgis/trunk@13316
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #332 from bischofia/shp_enc
+    
+    turn ignoreShapeEncoding option ON by default
 
-2010-04-15  cfarmer 
+Larry Shaffer 	2012-11-19
 
-	* python/plugins/fTools/tools/doGeoprocessing.py: Restore previous
-	version of dissolve function (previous changes should not have been
-	commited yet.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13315
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add ability to save PAL engine settings to project file (OFF by default)
+    
+    - Add 'Save settings with project' checkbox to engine settings dialog
+    - Add Restore Defaults button to engine settings dialog
+    - Unchecking 'save with project' will clear settings in project file on save
 
-2010-04-15  cfarmer 
+Minoru Akagi 	2012-11-20
 
-	* python/plugins/fTools/doAbout.py,
-	python/plugins/fTools/tools/doGeometry.py: Much faster centroid
-	computation, and simplified code. Also adds Alexander Bruy as fTools
-	contributor.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13314
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    set ignoreShapeEncoding option on by default
 
-2010-04-15  cfarmer 
+Victor Olaya 	2012-11-19
 
-	* python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/ftools_utils.py: Ensures that field
-	names for output shapefiles remain less than 10 chars. Patch
-	contributed by Alexander Bruy git-svn-id: http://svn.osgeo.org/qgis/trunk@13313
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improvementes to SEXTANTE batch processing interface
+    Better progress handling in SEXTANTE script algorithms
 
-2010-04-15  cfarmer 
+Radim Blazek 	2012-11-19
 
-	* python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doRegPoints.py: Adds validators for
-	numeric input text edits. Patch supplied by Alexander Bruy git-svn-id: http://svn.osgeo.org/qgis/trunk@13312
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    keep extent of overview set to union of extents of layer in overview; dont shrink on resize; fixes #1788
 
-2010-04-14  jef 
+Marco Hugentobler 	2012-11-19
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/qgsaddattrdialog.cpp, src/app/qgsaddattrdialog.h,
-	src/app/qgsidentifyresults.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/core/qgsvectorlayer.cpp: 
-	implement #2650, #2651, #2652 git-svn-id: http://svn.osgeo.org/qgis/trunk@13311
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Background color option for svg annotation. Save frame transparency (was missing also for text annotation)
 
-2010-04-14  jef 
+Marco Hugentobler 	2012-11-19
 
-	* src/app/attributetable/qgsattributetablemodel.cpp: fix #2549 git-svn-id: http://svn.osgeo.org/qgis/trunk@13310
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set better window titles for svg annotation
 
-2010-04-14  jef 
+Marco Hugentobler 	2012-11-19
 
-	* src/app/qgisapp.cpp, src/gui/qgsmapcanvas.cpp: fix #2654 git-svn-id: http://svn.osgeo.org/qgis/trunk@13309
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix loading / saving of layer order with embedded group
 
-2010-04-14  mhugent 
+Marco Hugentobler 	2012-11-19
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix rounding for WMS stripes git-svn-id: http://svn.osgeo.org/qgis/trunk@13308
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement embedded group aware drawing order mechanism (load/save to xm does not yet work)
 
-2010-04-13  jef 
+Alexander Bruy 	2012-11-19
 
-	* src/app/qgisapp.cpp, src/core/qgscoordinatereferencesystem.cpp: 
-	show message in status bar, when CRS of an added layer is undefined git-svn-id: http://svn.osgeo.org/qgis/trunk@13307
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missed images to SEXTANTE algorithm help files
 
-2010-04-13  jef 
+Victor Olaya 	2012-11-19
 
-	* src/gui/qgsattributeeditor.cpp: fix #2647 git-svn-id: http://svn.osgeo.org/qgis/trunk@13306
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    made SEXTANTE command line usage more pythonic
+    Fixed problem with temporary grass mapset created by SEXTANTE (wrong path)
 
-2010-04-13  jef 
+D'Hont René-Luc 	2012-11-18
 
-	* src/providers/wms/qgswmsprovider.cpp: fix #2639: - use asynchronous WMS GetMap requests only when render caching is
-	active - also cache WMS GetMap replies git-svn-id: http://svn.osgeo.org/qgis/trunk@13305
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WFS QGIS Server OnlineResource is an attribute in GetCapabilities for DCPType
 
-2010-04-13  jef 
+D'Hont René-Luc 	2012-11-18
 
-	* src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.cpp: show layer name in title of
-	layer properties dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@13304
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Post capabilities to DescribeFeature
 
-2010-04-12  macho 
+D'Hont René-Luc 	2012-11-18
 
-	* i18n/qgis_el_GR.ts, i18n/qgis_fr.ts: translation update: fr and
-	el_GR by Jean Roc and Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13303
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    #6608 QGIS crashes when used as WFS client together with QGIS server because of exportToGML2 MultiPolygon has empty coordinates
 
-2010-04-11  jef 
+D'Hont René-Luc 	2012-11-18
 
-	* debian/qgis-common.install,
-	debian/qgis-plugin-grass-common.install: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13302
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    XML Schema has attribute elementFormDefault and not elementFromDefault
 
-2010-04-11  jef 
+Radim Blazek 	2012-11-18
 
-	* src/app/qgisapp.cpp, src/providers/wms/qgswmsprovider.cpp: remove
-	another Qt 4.5 depencency git-svn-id: http://svn.osgeo.org/qgis/trunk@13301
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    graduated renderer GUI DnD and sort; categorized symbol GUI better drop indicator
 
-2010-04-11  jef 
+Merge: 28531f3 3f40232
+Victor Olaya 	2012-11-18
 
-	* src/app/composer/qgscomposermanager.cpp,
-	src/app/composer/qgscomposermanager.h, src/app/qgisapp.cpp,
-	src/core/qgsgeometry.cpp, src/ui/qgscomposermanagerbase.ui: remove
-	Qt 4.5 dependency and fix a warning git-svn-id: http://svn.osgeo.org/qgis/trunk@13300
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    minor change to last commit fixing #6635
 
-2010-04-11  mhugent 
+Victor Olaya 	2012-11-18
 
-	* src/core/qgshttptransaction.cpp: Fix for retrival of WFS
-	capabilities git-svn-id: http://svn.osgeo.org/qgis/trunk@13299
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6635. Partial solution, now it goes to (0,0) upon model loading
 
-2010-04-11  mmassing 
+Victor Olaya 	2012-11-18
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: Revive
-	thin plate spline transform.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13298
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6635. Partial solution, now it goes to (0,0) upon model loading
 
-2010-04-11  mmassing 
+Etienne Tourigny 	2012-11-17
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h: Disable world-file
-	in command line generator. Remove some code duplication.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13297
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add All Ramps items in tree widget
 
-2010-04-11  mmassing 
+Etienne Tourigny 	2012-10-07
 
-	* src/plugins/georeferencer/qgsmapcoordsdialog.cpp,
-	src/plugins/georeferencer/qgsmapcoordsdialogbase.ui: Patch #2633 by
-	mhugent: adds "snap to background" option when taking gcp
-	coordinates from main canvas.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13296
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    store relative cpt-city paths for portability
 
-2010-04-11  mmassing 
+Etienne Tourigny 	2012-10-07
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix gcp
-	coordinate sign in generated gdal script.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13295
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adjust .sip file after rebase
 
-2010-04-11  gsherman 
+Etienne Tourigny 	2012-10-07
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: Fix for compile failure
-	when buiding without spatialite.  Changed shortcut key for creating
-	new spatialite layer/database to Ctrl+Shift+A (previous value
-	conflicted with existing shortcut) git-svn-id: http://svn.osgeo.org/qgis/trunk@13294
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    allow to convert cpt-city ramps to standard gradients ramps, keeping author and license info in xml props ; allow to convert gradient ramps to/from discrete/continuous ramps and use float instead of integer stops
 
-2010-04-10  timlinux 
+Etienne Tourigny 	2012-09-22
 
-	* src/ui/qgsidentifyresultsbase.ui: Use a little less white space
-	around identify results dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@13293
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    make QgsCptCityColorRampV2 subclass of QgsVectorGradientColorRampV2 and adjust both accordingly (changed stops map to list)
 
-2010-04-10  mhugent 
+Radim Blazek 	2012-11-17
 
-	* src/core/qgsgeometry.cpp, src/core/qgsgeometry.h: Use more
-	accurate tolerances for some geometry modification methods if geom
-	values in degrees git-svn-id: http://svn.osgeo.org/qgis/trunk@13292
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    composer legend single column box width fix
 
-2010-04-09  mhugent 
+Merge: 845edd9 01775ce
+Giuseppe Sucameli 	2012-11-16
 
-	* python/core/qgsvectorlayer.sip,
-	src/app/qgsformannotationdialog.cpp, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/gui/qgsformannotationitem.cpp,
-	src/gui/qgsformannotationitem.h: Remember last annotation form for a
-	layer and store it in project git-svn-id: http://svn.osgeo.org/qgis/trunk@13291
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #330 from slarosa/master
+    
+    minor fix for python console
 
-2010-04-09  macho 
+Salvatore Larosa 	2012-11-16
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13290
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    icon changed for hide/show toolbar action
 
-2010-04-08  jef 
+Salvatore Larosa 	2012-11-16
 
-	* src/app/qgisapp.cpp: re-enable opening projects by drag&drop git-svn-id: http://svn.osgeo.org/qgis/trunk@13289
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    minor fix for console help dialog
 
-2010-04-08  jef 
+D'Hont René-Luc 	2012-11-16
 
-	* src/app/qgisapp.cpp: fix filters in Save as Image git-svn-id: http://svn.osgeo.org/qgis/trunk@13288
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Better support of TypeName and FeatureId in QGIS Server WFS
 
-2010-04-08  jef 
+Nathan Woodrow 	2012-11-07
 
-	* src/core/raster/qgsrasterlayer.cpp: apply #2376 git-svn-id: http://svn.osgeo.org/qgis/trunk@13287
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add --code arg to run python code on qgis load
 
-2010-04-08  kyngchaos 
+Larry Shaffer 	2012-11-14
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: new spatialite layer features
-	(r13240) qwt bundle always, since it depends on PyQt/Qt which is
-	always bundled git-svn-id: http://svn.osgeo.org/qgis/trunk@13286
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to limit of number of features sent to PAL
+    
+    - Distributes max number across total number of features registered in PAL
+    - Caveat: PAL may not show label for every registered feature
 
-2010-04-08  kyngchaos 
+Merge: 5bc0a8a 6abedba
+Jürgen Fischer 	2012-11-15
 
-	* doc/INSTALL.t2t: r13280 - restore part not dealing with PyQt git-svn-id: http://svn.osgeo.org/qgis/trunk@13285
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #320 from matthias-kuhn/fix-attredit
+    
+    Fix for http://hub.qgis.org/issues/6647
 
-2010-04-08  kyngchaos 
+Merge: 5053818 1237546
+Jürgen Fischer 	2012-11-15
 
-	* doc/INSTALL.t2t: revert r13280 - problem is in PyQt compilation,
-	and there is already a note to fix it in that section git-svn-id: http://svn.osgeo.org/qgis/trunk@13284
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #328 from slarosa/master
+    
+    Add action: Hide/Show toolbar for PyQGIS Console
 
-2010-04-08  mhugent 
+Juergen E. Fischer 	2012-11-16
 
-	* src/app/composer/qgscomposermanager.cpp,
-	src/app/composer/qgscomposermanager.h: Ask user what template to use
-	if default composer templates are found git-svn-id: http://svn.osgeo.org/qgis/trunk@13283
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix another build error and some warnings
 
-2010-04-08  mhugent 
+Juergen E. Fischer 	2012-11-16
 
-	*
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h: Show displacement renderer symbols in composer legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13282
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build error
 
-2010-04-08  mhugent 
+Juergen E. Fischer 	2012-11-16
 
-	* src/app/qgisapp.cpp: Added 0 pointer checks to saveAs git-svn-id: http://svn.osgeo.org/qgis/trunk@13281
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    ignore no ssl error error
 
-2010-04-08  gsherman 
+Victor Olaya 	2012-11-15
 
-	* doc/INSTALL.t2t: A few changes to the Mac build section from
-	jctull git-svn-id: http://svn.osgeo.org/qgis/trunk@13280
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    applied fix for #6127 (problems with non-ascii strings
 
-2010-04-08  gsherman 
+Merge: 10a57ad 7d0d5d3
+Victor Olaya 	2012-11-15
 
-	* resources/context_help/QgsNewSpatialiteLayerDialog-en_US,
-	src/app/qgisapp.cpp, src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h,
-	src/ui/qgsnewspatialitelayerdialogbase.ui: Add the option to include
-	a primary key when creating a new spatialite layer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13279
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-04-07  borysiasty 
+Etienne Tourigny 	2012-11-15
 
-	* python/plugins/mapserver_export/mapserverexport.py: apply patch
-	#1743 from jctull git-svn-id: http://svn.osgeo.org/qgis/trunk@13278
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    scanItemsInBrowser2/scanZipInBrowser2 : remove QgsApplication::upgradeConfig() and fix tests
 
-2010-04-07  mhugent 
+D'Hont René-Luc 	2012-11-15
 
-	* src/gui/qgsannotationitem.cpp: Remove warning git-svn-id: http://svn.osgeo.org/qgis/trunk@13277
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    DescribeFeatureType support namespace
 
-2010-04-07  jef 
+D'Hont René-Luc 	2012-11-15
 
-	* i18n/qgis_de.ts: rest of blanks git-svn-id: http://svn.osgeo.org/qgis/trunk@13276
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    DescribeFeatureType improvement
 
-2010-04-07  mhugent 
+Tim Sutton 	2012-11-15
 
-	* i18n/qgis_de.ts: More blanks translated git-svn-id: http://svn.osgeo.org/qgis/trunk@13275
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Unit test updates - mark bad tests as expectedFailure
 
-2010-04-07  mhugent 
+Tim Sutton 	2012-11-15
 
-	* i18n/qgis_de.ts: Added some spaces to german translations
-	(composer scale bar) git-svn-id: http://svn.osgeo.org/qgis/trunk@13274
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Mark vector file writer test as expected to fail.
 
-2010-04-07  mhugent 
+D'Hont René-Luc 	2012-11-15
 
-	* src/core/raster/qgsrasterlayer.cpp: Change filter string for DTED
-	raster (patch #1925 provided by kyle) git-svn-id: http://svn.osgeo.org/qgis/trunk@13273
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Correcting tests from test_qgsrectangle.py
 
-2010-04-07  jef 
+Victor Olaya 	2012-11-15
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsnetworkproxyfactory.cpp,
-	src/app/qgsnetworkproxyfactory.h: instantiate proxy factory only
-	once git-svn-id: http://svn.osgeo.org/qgis/trunk@13272
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed problem when running grass in modeler (wrong output names, it was a problem introduced by the grass session functionalities)
+    reverted shell=true in R execution
+    Removed help files help menu
 
-2010-04-06  jef 
+Merge: 36da82a 3f4f5f0
+Martin Dobias 	2012-11-14
 
-	* src/app/qgisapp.cpp, src/providers/spatialite/CMakeLists.txt: show
-	PostgreSQL and SpatiaLite version in about git-svn-id: http://svn.osgeo.org/qgis/trunk@13271
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-04-06  jef 
+Sandro Santilli 	2012-11-14
 
-	* src/providers/spatialite/CMakeLists.txt,
-	src/providers/spatialite/qgsspatialiteprovider.h: missed a directory
-	in r13269 git-svn-id: http://svn.osgeo.org/qgis/trunk@13270
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set max number of labels to 100 for edge label layer (topoviewer)
 
-2010-04-06  jef 
+Sandro Santilli 	2012-11-14
 
-	* python/CMakeLists.txt, src/app/CMakeLists.txt,
-	src/app/qgsspatialitesourceselect.h, src/gui/CMakeLists.txt: fix
-	windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@13269
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Limit max number of node labels to 100, and candidate positions to 1
+    
+    Also set layer transparency to 100% (there's a separate layer with the dots)
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-11-13
 
-	* : apply #2385 git-svn-id: http://svn.osgeo.org/qgis/trunk@13266
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Validation after merging
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-11-12
 
-	* src/app/qgisapp.cpp: fix #2631 git-svn-id: http://svn.osgeo.org/qgis/trunk@13265
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add geometric method
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-11-09
 
-	* python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/gui/qgslegendinterface.h: [FEATURE] legend interface added to
-	retrieve layers in legend order (supplied by Maxim Dubinin) git-svn-id: http://svn.osgeo.org/qgis/trunk@13264
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add CQL_FILTER to WFS for QgsExpression
 
-2010-04-06  timlinux 
+D'Hont René-Luc 	2012-11-09
 
-	* python/plugins/mapserver_export/ms_export.py: Fixed a crash in the
-	plugin that occurs when the epsg code for a web section cannot be
-	parsed git-svn-id: http://svn.osgeo.org/qgis/trunk@13263
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsRectangle From GML2
 
-2010-04-06  timlinux 
+D'Hont René-Luc 	2012-11-09
 
-	* python/plugins/mapserver_export/ms_export.py: Fixed a crash in the
-	plugin that occurs when the epsg code for a layer cannot be parsed git-svn-id: http://svn.osgeo.org/qgis/trunk@13262
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Ending spatial test
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-11-08
 
-	* src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h: followup r13227 git-svn-id: http://svn.osgeo.org/qgis/trunk@13261
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    First spatial test
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-11-05
 
-	* src/providers/ogr/qgsogrprovider.cpp: ogr provider: update layer
-	extent after feature deletion and debugging improvements git-svn-id: http://svn.osgeo.org/qgis/trunk@13259
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove QgsExpression::SpatialNode and the Server QgsFilter use in QGIS WFS Server
 
-2010-04-06  gsherman 
+D'Hont René-Luc 	2012-11-05
 
-	* src/app/qgisapp.cpp: Fix loading of spatialite table after
-	creation git-svn-id: http://svn.osgeo.org/qgis/trunk@13258
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    First test with Qvariant QgsGeometry*
 
-2010-04-06  jef 
+D'Hont René-Luc 	2012-10-29
 
-	* src/core/qgsvectorlayer.cpp: fix crash when added features were
-	deleted git-svn-id: http://svn.osgeo.org/qgis/trunk@13257
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Spatial Operator to QgsExpression and use it in QGIS WFS Server
 
-2010-04-05  jef 
+D'Hont René-Luc 	2012-10-18
 
-	* i18n/qgis_de.ts, src/providers/postgres/qgspostgresprovider.cpp: 
-	german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13256
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    #2781 Relative paths to SvgMarker doesn't work in new symbology
 
-2010-04-05  jef 
+D'Hont René-Luc 	2012-11-14
 
-	* src/core/qgscoordinatereferencesystem.cpp: don't implictly add the
-	same CRS over and over git-svn-id: http://svn.osgeo.org/qgis/trunk@13255
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-05  wonder 
-
-	* src/app/CMakeLists.txt: Fixed compilation with internal spatialite
-	(src/core/spatialite/headers/spatialite/spatialite.h was shadowing
-	the wanted src/core/spatialite/headers/spatialite.h) git-svn-id: http://svn.osgeo.org/qgis/trunk@13254
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-05  jef 
-
-	* src/gui/qgsprojectionselector.cpp,
-	src/gui/qgsprojectionselector.h,
-	src/ui/qgsprojectionselectorbase.ui: use list instead of buttons for
-	popular/recent projections git-svn-id: http://svn.osgeo.org/qgis/trunk@13253
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-05  jef 
-
-	* src/app/attributetable/qgsattributetabledelegate.cpp,
-	src/app/qgsattributetypedialog.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/core/qgsvectorlayer.h,
-	src/gui/qgsattributeeditor.cpp, src/gui/qgsattributeeditor.h,
-	src/ui/qgsattributetypeedit.ui: add widget support for dials and
-	calendar git-svn-id: http://svn.osgeo.org/qgis/trunk@13252
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove the capability to not get geometry in WFS GetFetaure request
 
-2010-04-05  jef 
+Alexander Bruy 	2012-11-14
 
-	* debian/rules: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@13251
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-04-05  jef 
+Larry Shaffer 	2012-11-13
 
-	* debian/control.sid, python/core/qgsapplication.sip,
-	src/app/qgisapp.cpp, src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/app/qgsspatialitesridsdialog.cpp,
-	src/app/qgsspatialitesridsdialog.h, src/core/qgsapplication.h,
-	src/providers/spatialite/qgsspatialiteprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.h,
-	src/ui/qgsnewspatialitelayerdialogbase.ui: spatialite improvements: - support geometry column name - remove unnecessary id field - fix windows build - better identifier quoting and utf-8 support - update python binding - fix some translation strings git-svn-id: http://svn.osgeo.org/qgis/trunk@13250
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add option to limit number of labels rendered per layer (OFF by default)
+    
+    - Initial limit set to 2000
+    - Results would look better if limited subset was a random sampling of all features
 
-2010-04-05  macho 
+Salvatore Larosa 	2012-11-13
 
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@13249
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    changes console help in window modal
 
-2010-04-05  gsherman 
+Etienne Tourigny 	2012-11-13
 
-	* src/app/qgsnewspatialitelayerdialog.cpp: Create new database
-	immediately on selection of the location. This prevents errors when
-	attempting to lookup an srid before the database exists git-svn-id: http://svn.osgeo.org/qgis/trunk@13242
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix promptForRasterSublayers=Load all
 
-2010-04-05  gsherman 
+Etienne Tourigny 	2012-11-13
 
-	* src/app/qgsspatialitesridsdialog.cpp: Added missing header to
-	qgsspatialitesridsdialog.cpp git-svn-id: http://svn.osgeo.org/qgis/trunk@13241
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix loading rasters with sublayers from commandline and add raster command
 
-2010-04-05  gsherman 
+Radim Blazek 	2012-11-13
 
-	* resources/CMakeLists.txt,
-	resources/context_help/QgsNewSpatialiteLayerDialog-en_US,
-	src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsnewspatialitelayerdialog.cpp,
-	src/app/qgsnewspatialitelayerdialog.h,
-	src/app/qgsspatialitesridsdialog.cpp,
-	src/app/qgsspatialitesridsdialog.h, src/core/qgsapplication.cpp,
-	src/core/qgsapplication.h,
-	src/ui/qgsnewspatialitelayerdialogbase.ui,
-	src/ui/qgsspatialitesridsdialogbase.ui: Implementation of the "Add
-	New Spatialite Layer/Database" feature.  Squashed commit of the
-	following: commit e6e01ec0b3955d1cf9cb2756dfcf1aac27a0725e Author: Gary Sherman
-	 Date:   Sun Apr 4 17:45:05 2010 -0800     Implementation of the add new spatialite layer dialog with
-	    ability to search for epsg srid commit c1d46e35715e4f8baa137800c88483f612ebcb89 Author: Gary Sherman
-	 Date:   Sun Apr 4 17:44:23 2010 -0800     Spatialite database template used when creating a new database commit 6d4fd8d80e610d6f0f6d22ed49815134292924c5 Author: Gary Sherman
-	 Date:   Sun Apr 4 17:43:31 2010 -0800     Context help for the Add New Spatialite Layer dialog commit 1a6398be174d62df1bf74428bcf898b8d1ea8455 Author: Gary Sherman
-	 Date:   Sun Apr 4 17:42:51 2010 -0800     Dialog for finding an SRID from the spatialite spatial_ref_sys
-	    table commit 197a65c134ed06b12fd6c8d96900dcf8197f802d Author: Gary Sherman
-	 Date:   Sat Apr 3 11:32:58 2010 -0800     Renamed the spatialite srids dialog selector to the proper form commit 66c7cafa78f71b7f06504fe3b7bd4577614bfe67 Author: Gary Sherman
-	 Date:   Fri Apr 2 22:25:09 2010 -0800     Implemented create new db. Can now create a new db and an empty
-	    layer in one pass.  commit 088730293ad4722e7d6045e8661e6c28488b8cae Author: Gary Sherman
-	 Date:   Fri Apr 2 20:43:12 2010 -0800     Adjust new spatialite layer dialog. Add field for geometry
-	    column name commit d7c60012ddce6a70d0512bc9195524e6d672b372 Author: Gary Sherman
-	 Date:   Fri Apr 2 12:46:49 2010 -0800     New spatialite layer menu item does not show up if qgis is built
-	    with internal spatialite commit 1343dfe7ac7868c38e8b7bd17ef1dd5a4a04ebad Author: Gary Sherman
-	 Date:   Fri Apr 2 11:35:26 2010 -0800     Test of geometry column creation in the dialog commit c8785f4aaee9d5b08fe0c0dd6f6bbfcd9cf6c7a5 Author: Gary Sherman
-	 Date:   Wed Mar 31 21:39:03 2010 -0800     Added multi geometry types to the radio button group commit 06350192b9dfa6d6cc5c6ac9c4d0b1a65f260476 Author: Gary Sherman
-	 Date:   Wed Mar 31 21:13:20 2010 -0800     SQL for creating the new spatialite table complete---still needs
-	    the code to actually push it to the database commit 0e05d6ab9904d003d9c7c7704f53392fc478cee1 Author: Gary Sherman
-	 Date:   Wed Mar 31 21:12:25 2010 -0800     Added field for the layer name to be created commit 3c372b4da3097981d824c2dbb7a661c916d9cf7b Author: Gary Sherman
-	 Date:   Tue Mar 30 21:39:10 2010 -0800     Removed unneeded fields from the spatialite dialog (width and
-	    precision). Added methods for getting the attributes commit 1871db18a5d87f22caf9a34001c879eaf7f58342 Author: Gary Sherman
-	 Date:   Fri Mar 19 20:51:34 2010 -0800     Renamed ui file commit a42e578afac13d2a9e984faedc79d0d206b48c66 Author: Gary Sherman
-	 Date:   Fri Mar 19 20:51:00 2010 -0800     Added dialog for displaying and selecting a spatialite srid commit d0c48bc2317d175fa13c4e52fb6d4f0b10a58518 Author: Gary Sherman
-	 Date:   Fri Mar 19 19:41:07 2010 -0800     More work on the dialog to create a new spatialite layer commit cc6d8a4e48e42c865eec9da3d2ad1e900fbbe295 Author: Gary Sherman
-	 Date:   Thu Mar 18 20:51:08 2010 -0800     Wire the new spatialite layer dialog into qgisapp commit c5a54601fd9b76e46aeb534f92a605cd744ae768 Author: Gary Sherman
-	 Date:   Thu Mar 18 20:50:18 2010 -0800     Dialog implementation for creating a new spatialite layer git-svn-id: http://svn.osgeo.org/qgis/trunk@13240
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-04  mhugent 
-
-	* src/app/composer/qgscomposermanager.cpp: Show composer manager as
-	top window after showing composer instance git-svn-id: http://svn.osgeo.org/qgis/trunk@13239
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-04  wonder 
-
-	* python/utils.py: [FEATURE] support for custom plugin directories
-	using QGIS_PLUGINPATH environment variables.  More paths can be
-	passed, separated by semicolon. Patch from Chris Crook (#2608),
-	slightly modified.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13236
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-04  jef 
-
-	* src/plugins/grass/qgsgrassmodule.cpp: fix #2620 git-svn-id: http://svn.osgeo.org/qgis/trunk@13235
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-03  jef 
-
-	* src/app/qgswmssourceselect.cpp: fix #2624 git-svn-id: http://svn.osgeo.org/qgis/trunk@13234
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-03  macho 
-
-	* i18n/qgis_fr.ts: translation update: fr by Jean Roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13233
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-04-03  mhugent 
-
-	* src/app/composer/qgscomposermanager.cpp: Disable remove button in
-	composer manager for default templates to prevent crash git-svn-id: http://svn.osgeo.org/qgis/trunk@13232
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    multicolumn composer legend
 
-2010-04-03  mmassing 
+Alexander Bruy 	2012-11-13
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix lanczos
-	resampling option.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13231
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    deactivate TauDEM provider by default
 
-2010-04-03  mmassing 
+Merge: 3b88637 543ac03
+mhugent 	2012-11-13
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Patch #2480 by
-	Jack R: quote filenames in gdal scripts.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13230
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #329 from matthias-kuhn/diagram
+    
+    Diagrams: Hide background color button when unnecessary
 
-2010-04-03  mmassing 
+Matthias Kuhn 	2012-11-13
 
-	* src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.h,
-	src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h: Patch #2622 by
-	mhugent, enabling visualization of transform residuals as arrow.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13229
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Diagrams: Hide background color button when unnecessary
 
-2010-04-03  mhugent 
+Salvatore Larosa 	2012-11-12
 
-	* src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposermanager.cpp,
-	src/app/composer/qgscomposermanager.h: [FEATURE]: implement
-	possibility to place a set of default composer templates in
-	pkgDataPath/composer_templates git-svn-id: http://svn.osgeo.org/qgis/trunk@13228
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added action: Hide/Show toolbar for PyQGIS Console
+    - image help update
 
-2010-04-03  jef 
+Victor Olaya 	2012-11-12
 
-	* src/app/qgscustomprojectiondialog.cpp,
-	src/app/qgscustomprojectiondialog.h: cleanup and fix #2619 git-svn-id: http://svn.osgeo.org/qgis/trunk@13227
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6571
 
-2010-04-01  kyngchaos 
+Sandro Santilli 	2012-11-12
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: remove unused mapserver
-	code (r13216) git-svn-id: http://svn.osgeo.org/qgis/trunk@13222
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use ASCII direction arrows
 
-2010-04-01  jef 
+Merge: 4195eaf aaded5a
+Werner Macho 	2012-11-12
 
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: use other approach to
-	avoid estimate_extents on not analyzed tables git-svn-id: http://svn.osgeo.org/qgis/trunk@13221
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #327 from slarosa/master
+    
+    Updating for translation in console help
 
-2010-04-01  mhugent 
+Salvatore Larosa 	2012-11-12
 
-	* src/app/qgstextannotationdialog.cpp: Fix for bug #2617 git-svn-id: http://svn.osgeo.org/qgis/trunk@13220
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update the console help:
+    - update italian/english translations
 
-2010-04-01  jef 
+Sandro Santilli 	2012-11-12
 
-	* src/app/qgsidentifyresults.cpp: also update changed display field
-	value in identify results git-svn-id: http://svn.osgeo.org/qgis/trunk@13218
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    TopoViewer: add direction symbol for "next_right_edge" layer
 
-2010-04-01  mhugent 
+Alexander Bruy 	2012-11-12
 
-	* python/core/qgsapplication.sip,
-	src/app/composer/qgscomposerpicturewidget.cpp,
-	src/core/qgsapplication.cpp, src/core/qgsapplication.h: Make default
-	svg path configurable for third party apps git-svn-id: http://svn.osgeo.org/qgis/trunk@13217
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Ukrainian translation update
 
-2010-03-31  jef 
+Merge: e11ee59 4496c74
+Alexander Bruy 	2012-11-12
 
-	* src/app/qgsmapserverexport.cpp, src/app/qgsmapserverexport.h,
-	src/ui/CMakeLists.txt, src/ui/qgsmapserverexportbase.ui: remove
-	unused c++ mapserver export (and Qt3 dependency in UI) git-svn-id: http://svn.osgeo.org/qgis/trunk@13216
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'sextante_user_dir'
 
-2010-03-31  jef 
+Alexander Bruy 	2012-11-12
 
-	* src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgshttptransaction.cpp, src/core/qgsmessageoutput.cpp,
-	src/core/qgsvectorlayer.h, src/plugins/grass/qgsgrassmapcalc.h,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/providers/grass/qgsgrass.h,
-	src/providers/wms/qgswmsprovider.cpp: follow up r13213 git-svn-id: http://svn.osgeo.org/qgis/trunk@13215
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missed scripts to examples group
 
-2010-03-31  wonder 
+Alexander Bruy 	2012-11-12
 
-	* python/plugins/fTools/CMakeLists.txt: dummy change in CMakeLists
-	in fTools to trigger update of list of the files git-svn-id: http://svn.osgeo.org/qgis/trunk@13214
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    put sextante config dir under ~/.qgis (fix #6662)
+    also fix scripts lookup
 
-2010-03-31  jef 
+Alexander Bruy 	2012-11-12
 
-	* src/core/qgshttptransaction.cpp: initialize QString with empty
-	string instead of 0 (Qt 4.7 doesn't like it) git-svn-id: http://svn.osgeo.org/qgis/trunk@13213
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    remove patch from sources
 
-2010-03-31  jef 
+Alexander Bruy 	2012-11-12
 
-	* src/app/qgsidentifyresults.cpp, src/app/qgsidentifyresults.h: 
-	consider attribute changes in identify results git-svn-id: http://svn.osgeo.org/qgis/trunk@13212
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    get rid of "&" symbol in SAGA description and help files
 
-2010-03-31  mhugent 
+Alexander Bruy 	2012-11-12
 
-	* src/app/qgisapp.cpp: Objectname for undo widget git-svn-id: http://svn.osgeo.org/qgis/trunk@13211
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix installing SEXTANTE sample modeles and scripts
 
-2010-03-31  jef 
+Victor Olaya 	2012-11-12
 
-	* src/app/qgsannotationwidget.cpp,
-	src/app/qgstextannotationdialog.cpp: remove more Qt 4.5 dependencies git-svn-id: http://svn.osgeo.org/qgis/trunk@13209
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added new vector algorithms
 
-2010-03-31  jef 
+Larry Shaffer 	2012-11-11
 
-	* i18n/qgis_de.ts, python/plugins/fTools/tools/doMergeShapes.py: 
-	german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13208
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove old direction symbol option from labeling gui
 
-2010-03-31  mhugent 
+Larry Shaffer 	2012-11-10
 
-	* src/core/composer/qgscomposermap.cpp: no selection squares in
-	print mode git-svn-id: http://svn.osgeo.org/qgis/trunk@13207
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add custom line direction symbols to labeling
+    
+    - Options to place symbol above or below label text
+    - Option to reverse symbol direction
+    - Add character selector dialog for single font to src/gui
 
-2010-03-31  kyngchaos 
+Merge: c4b74c9 b2eb1c1
+Giuseppe Sucameli 	2012-11-11
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: ftools merge shapes
-	(r13204) git-svn-id: http://svn.osgeo.org/qgis/trunk@13206
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #325 from slarosa/master
+    
+    Updating help and minor changes for console
 
-2010-03-30  cfarmer 
+Salvatore Larosa 	2012-11-11
 
-	* python/plugins/fTools/tools/doSelectByLocation.py: Update to
-	select by location tool: should run faster for large layers, and
-	requires less memory. Should also fix #1669 git-svn-id: http://svn.osgeo.org/qgis/trunk@13205
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    updating help and minor changes for console
 
-2010-03-30  cfarmer 
+Radim Blazek 	2012-11-11
 
-	* python/plugins/fTools/fTools.py,
-	python/plugins/fTools/resources.qrc,
-	python/plugins/fTools/tools/doMergeShapes.py,
-	python/plugins/fTools/tools/frmMergeShapes.ui: Adds 'merge shapes'
-	tool to fTools (vector tools). Thanks to Alexander Bruy for the
-	patch.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13204
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Categorized vector GUI DnD and sorting, fixes #2816
 
-2010-03-29  jef 
+Werner Macho 	2012-11-11
 
-	* : use same parameters for EPSG:3857, EPSG:GOOGLE and OSGEO:41001
-	as PROJ.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@13200
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: and add swahili language coordinator
 
-2010-03-29  jef 
+Werner Macho 	2012-11-11
 
-	* : add EPSG:3857 (fixes #2484) git-svn-id: http://svn.osgeo.org/qgis/trunk@13199
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: added swahili on request
 
-2010-03-29  macho 
+Victor Olaya 	2012-11-11
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13198
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fixed #6619
 
-2010-03-29  timlinux 
+Marco Hugentobler 	2012-11-10
 
-	* src/ui/qgsannotationwidgetbase.ui,
-	src/ui/qgstextannotationdialogbase.ui: HIG compliance updates for
-	annotation dialogs git-svn-id: http://svn.osgeo.org/qgis/trunk@13197
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Zonal statistics: avoid access to pixels outside the raster. Fixes ticket #6624
 
-2010-03-29  wonder 
+Werner Macho 	2012-11-10
 
-	* tests/src/core/CMakeLists.txt,
-	tests/src/core/testqgssearchstring.cpp: added some unit tests for
-	search strings git-svn-id: http://svn.osgeo.org/qgis/trunk@13196
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  jef 
-
-	* src/gui/CMakeLists.txt: back to unix mode git-svn-id: http://svn.osgeo.org/qgis/trunk@13195
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: annotation tools
-	(r13189, r13190) git-svn-id: http://svn.osgeo.org/qgis/trunk@13194
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  mhugent 
-
-	* src/gui/CMakeLists.txt: Fix for win build git-svn-id: http://svn.osgeo.org/qgis/trunk@13193
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  mhugent 
-
-	* src/core/composer/qgscomposermap.cpp: Hide invisible annotations
-	in composer too git-svn-id: http://svn.osgeo.org/qgis/trunk@13192
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  mhugent 
-
-	* src/app/qgsannotationwidget.h, src/app/qgsformannotationdialog.h,
-	src/app/qgstextannotationdialog.h,
-	src/core/composer/qgscomposermap.cpp: Enable annotation items in
-	composer. Remove gui export from classes that have been moved to app git-svn-id: http://svn.osgeo.org/qgis/trunk@13191
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  mhugent 
-
-	* python/gui/qgsannotationitem.sip,
-	python/gui/qgsformannotationitem.sip,
-	python/gui/qgstextannotationitem.sip, src/app/CMakeLists.txt,
-	src/app/qgsannotationwidget.cpp, src/app/qgsannotationwidget.h,
-	src/app/qgsformannotationdialog.cpp,
-	src/app/qgsformannotationdialog.h,
-	src/app/qgsmaptoolannotation.cpp, src/app/qgsmaptoolannotation.h,
-	src/app/qgstextannotationdialog.cpp,
-	src/app/qgstextannotationdialog.h, src/gui/CMakeLists.txt,
-	src/gui/qgsannotationitem.h, src/gui/qgsannotationwidget.cpp,
-	src/gui/qgsannotationwidget.h, src/gui/qgsformannotationdialog.cpp,
-	src/gui/qgsformannotationdialog.h,
-	src/gui/qgsformannotationitem.cpp, src/gui/qgsformannotationitem.h,
-	src/gui/qgstextannotationdialog.cpp,
-	src/gui/qgstextannotationdialog.h,
-	src/gui/qgstextannotationitem.cpp, src/gui/qgstextannotationitem.h: 
-	Move annotation items and widgets from gui to app git-svn-id: http://svn.osgeo.org/qgis/trunk@13190
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  mhugent 
-
-	* images/images.qrc, python/gui/gui.sip,
-	python/gui/qgsannotationitem.sip,
-	python/gui/qgsformannotationitem.sip,
-	python/gui/qgstextannotationitem.sip, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsmaptoolannotation.cpp, src/app/qgsmaptoolannotation.h,
-	src/app/qgsmaptoolformannotation.cpp,
-	src/app/qgsmaptoolformannotation.h,
-	src/app/qgsmaptooltextannotation.cpp,
-	src/app/qgsmaptooltextannotation.h, src/gui/CMakeLists.txt,
-	src/gui/qgsannotationitem.cpp, src/gui/qgsannotationitem.h,
-	src/gui/qgsannotationwidget.cpp, src/gui/qgsannotationwidget.h,
-	src/gui/qgsformannotationdialog.cpp,
-	src/gui/qgsformannotationdialog.h,
-	src/gui/qgsformannotationitem.cpp, src/gui/qgsformannotationitem.h,
-	src/gui/qgstextannotationdialog.cpp,
-	src/gui/qgstextannotationdialog.h,
-	src/gui/qgstextannotationitem.cpp, src/gui/qgstextannotationitem.h,
-	src/ui/qgsannotationwidgetbase.ui,
-	src/ui/qgsformannotationdialogbase.ui,
-	src/ui/qgstextannotationdialogbase.ui: [FEATURE]: text and form
-	annotation tools are now in gui and app git-svn-id: http://svn.osgeo.org/qgis/trunk@13189
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-29  macho 
-
-	* i18n/qgis_es.ts: another translation update es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@13188
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  jef 
-
-	* doc/CODING.t2t, src/app/ogr/qgsnewogrconnection.cpp,
-	src/app/qgstilescalewidget.cpp, src/app/qgstilescalewidget.h,
-	src/core/qgsprojectfiletransform.cpp,
-	src/core/qgsprojectfiletransform.h,
-	src/plugins/dxf2shp_converter/dxf2shpconverter.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnection.h,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h,
-	src/plugins/evis/databaseconnection/evisdatabaselayerfieldselection
-	gui.cpp,
-	src/plugins/evis/databaseconnection/evisdatabaselayerfieldselection
-	gui.h, src/plugins/evis/databaseconnection/evisquerydefinition.cpp,
-	src/plugins/evis/databaseconnection/evisquerydefinition.h,
-	src/plugins/evis/eventbrowser/evisconfiguration.cpp,
-	src/plugins/evis/eventbrowser/evisconfiguration.h,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp,
-	src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h,
-	src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp,
-	src/plugins/evis/eventbrowser/evisimagedisplaywidget.h,
-	src/plugins/evis/evis.cpp, src/plugins/evis/evis.h,
-	src/plugins/evis/idtool/eviseventidtool.cpp,
-	src/plugins/evis/idtool/eviseventidtool.h,
-	src/plugins/oracle_raster/qgsoracle_plugin.cpp: add missing
-	svn:keywords git-svn-id: http://svn.osgeo.org/qgis/trunk@13187
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: wms scale slider
-	(r13184) git-svn-id: http://svn.osgeo.org/qgis/trunk@13186
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  jef 
-
-	* src/gui/qgsprojectionselector.cpp,
-	src/gui/qgsprojectionselector.h,
-	src/ui/qgsprojectionselectorbase.ui: projection search improvements
-	(fixes #2602) git-svn-id: http://svn.osgeo.org/qgis/trunk@13185
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  jef 
-
-	* src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgstilescalewidget.cpp, src/app/qgstilescalewidget.h,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/ui/qgstilescalewidgetbase.ui, src/ui/qgswmssourceselectbase.ui: 
-	[FEATURE] wms-c scale slider and more selection improvements git-svn-id: http://svn.osgeo.org/qgis/trunk@13184
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  macho 
-
-	* i18n/qgis_es.ts, i18n/qgis_fr.ts: translation update: es by carlos
-	and fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13183
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  wonder 
-
-	* src/app/attributetable/qgsattributetabledialog.cpp: Escape single
-	quotes in quick search in attribute table git-svn-id: http://svn.osgeo.org/qgis/trunk@13180
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  wonder 
-
-	* src/core/qgssearchtreenode.cpp: Restored quick search behaviour
-	(#2407) - was a side effect when fixing #2007 git-svn-id: http://svn.osgeo.org/qgis/trunk@13179
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  wonder 
-
-	* src/core/qgssearchtreenode.cpp, src/core/qgssearchtreenode.h: 
-	Initialize distance/area calculator only if we will be doing any
-	calculations (saves crs lookups when creating search tree nodes) git-svn-id: http://svn.osgeo.org/qgis/trunk@13177
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-28  wonder 
-
-	* src/app/qgsmaptoolsimplify.cpp: Fixed a segfault with simplify
-	tool (#2450) git-svn-id: http://svn.osgeo.org/qgis/trunk@13176
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: gl_ES by XAN
 
-2010-03-27  wonder 
+Larry Shaffer 	2012-11-09
 
-	* python/gui/qgisinterface.sip, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h: Added missing
-	method advancedDigitizeToolBar() in qgis interface.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13175
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add data defined option to always show a label, unless overridden
+    
+    - Label is skipped during PAL priority calculation, permitting collisions and overlaps
+    - Overridden by layer and data defined 'scale/pixel size visibility' and data defined 'show label'  options
+    - Add option to Change Label tool
 
-2010-03-27  wonder 
+Nathan Woodrow 	2012-11-04
 
-	* python/utils.py: Applied patch from #2582.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13174
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Add ability to create user defined Python (and C++) expression functions
 
-2010-03-27  kyngchaos 
+Victor Olaya 	2012-11-10
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: conditionalize some Qt
-	settings on version git-svn-id: http://svn.osgeo.org/qgis/trunk@13173
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    disabled postgis algs until they are ready
 
-2010-03-27  kyngchaos 
+Merge: 27f197c e5f07ed
+Victor Olaya 	2012-11-10
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: vector layer saving
-	(r13169) git-svn-id: http://svn.osgeo.org/qgis/trunk@13170
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-03-27  jef 
+Victor Olaya 	2012-11-10
 
-	* python/core/qgsvectordataprovider.sip, src/app/CMakeLists.txt,
-	src/app/legend/qgslegendlayer.cpp, src/app/legend/qgslegendlayer.h,
-	src/app/ogr/qgsopenvectorlayerdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.cpp,
-	src/app/ogr/qgsvectorlayersaveasdialog.h, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/core/qgsproviderregistry.h,
-	src/core/qgsvectordataprovider.cpp,
-	src/core/qgsvectordataprovider.h, src/core/qgsvectorfilewriter.cpp,
-	src/core/qgsvectorfilewriter.h, src/gui/qgsencodingfiledialog.cpp,
-	src/plugins/ogr_converter/format.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/ui/qgsopenvectorlayerdialogbase.ui,
-	src/ui/qgsvectorlayersaveasdialogbase.ui: [FEATURE] allow saving
-	vector layers as ogr vector files git-svn-id: http://svn.osgeo.org/qgis/trunk@13169
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed problems with missing example scripts folder
+    Restructured gdal tools (now gdal/ogr)
+    Added new OTB segmentation algos
 
-2010-03-27  jef 
+Larry Shaffer 	2012-11-07
 
-	* src/core/composer/qgscomposermap.cpp: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13168
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add pixel size limiting for labels defined in map units
+    
+    - Allows user to quickly set visibility thresholds based upon text legibility
+    - By default initially on for map unit labels to skip rendering at sizes < 3 px
 
-2010-03-26  jef 
+Merge: a2d4347 17c5e37
+volaya 	2012-11-09
 
-	* src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h: fix #2592 git-svn-id: http://svn.osgeo.org/qgis/trunk@13167
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #324 from giohappy/master
+    
+    Quote input vector/raster path parameter in Sextante SagaAlgorithm
 
-2010-03-26  wonder 
+giohappy 	2012-11-09
 
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp: fixed several
-	bugs related to creation of offset line in new symbology (including
-	#2545) git-svn-id: http://svn.osgeo.org/qgis/trunk@13166
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update python/plugins/sextante/saga/SagaAlgorithm.py
+    
+    Add quotes to input vector/raster paths parameters
 
-2010-03-26  jef 
+Alexander Bruy 	2012-11-09
 
-	* src/providers/postgres/qgspostgresprovider.cpp: another postgres
-	feature count fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13165
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] Eliminate tool for fTools, contributed by Bernhard Strobl
 
-2010-03-26  kyngchaos 
+Merge: 716e188 05aca2b
+alexbruy 	2012-11-09
 
-	* INSTALL, doc/INSTALL.t2t: update Mac build for Qt minimum and misc
-	cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@13163
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #323 from sanak/ftools-dissolve-line
+    
+    Add line layer support for dissolve function (fix #5059)
 
-2010-03-26  kyngchaos 
+Merge: 3f72a6a 36452a8
+mhugent 	2012-11-09
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: grass module filename
-	fix (r13156) git-svn-id: http://svn.osgeo.org/qgis/trunk@13162
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #321 from matthias-kuhn/rubberband
+    
+    [FIX]: Build rubberband completely even with incomplete input
 
-2010-03-25  mhugent 
+Tim Sutton 	2012-11-09
 
-	* src/core/symbology/qgsmarkercatalogue.cpp: Remove minimum sizes in
-	marker catalogue (patch from ticket #1912) git-svn-id: http://svn.osgeo.org/qgis/trunk@13161
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added from uri test for mem provider. Simplified the vector writer test.
 
-2010-03-25  macho 
+Merge: 3564eae 3250221
+Giuseppe Sucameli 	2012-11-09
 
-	* i18n/qgis_ja.ts: translation update: ja git-svn-id: http://svn.osgeo.org/qgis/trunk@13160
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #322 from matthias-kuhn/ellipsemarker
+    
+    Alpha for ellipse marker (fix #6668)
 
-2010-03-25  rblazek 
+Matthias Kuhn 	2012-11-09
 
-	* src/plugins/grass/qgsgrassselect.cpp: disabled Vect_close if map
-	cannot be opened on level2 on win to test ticket 2003 git-svn-id: http://svn.osgeo.org/qgis/trunk@13159
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FIX] Alpha for ellipse marker
+    http://hub.qgis.org/issues/6668
 
-2010-03-25  rblazek 
+sanak 	2012-11-06
 
-	* src/providers/grass/qgsgrass.cpp: enabled toLocal8Bit for GISDBASE
-	on win git-svn-id: http://svn.osgeo.org/qgis/trunk@13158
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add line layer support for dissolve function.
 
-2010-03-25  rblazek 
+Tim Sutton 	2012-11-09
 
-	* src/plugins/grass/qgsgrassselect.cpp,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp: QgsGrass::Exception
-	reverted to std::runtime_error because with QgsException could not
-	be caught git-svn-id: http://svn.osgeo.org/qgis/trunk@13157
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added unit test for vector file writer as it is currently segfaulting in master
 
-2010-03-25  rblazek 
+Juergen E. Fischer 	2012-11-09
 
-	* : fixed name git-svn-id: http://svn.osgeo.org/qgis/trunk@13156
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    debian packaging update
 
-2010-03-25  jef 
+Matthias Kuhn 	2012-11-09
 
-	* src/app/qgisapp.cpp, src/core/qgscoordinatereferencesystem.cpp: 
-	fix #2588 git-svn-id: http://svn.osgeo.org/qgis/trunk@13155
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FIX]: Build rubberband completely even with incomplete input
+    An empty polyline in a mulipolyline led to the rubberband ignoring all further polylines.
+    e.g. addGeometry( [[(1,2)(2,3)][][(2,3)(3,4)]] ) was ignoring the polyline (2,3)(3,4).
 
-2010-03-24  mhugent 
+Sandro Santilli 	2012-11-08
 
-	* src/app/composer/qgscomposer.cpp,
-	src/core/composer/qgscomposermap.cpp,
-	src/core/composer/qgscomposermap.h: Code for drawing items in
-	composer map. Not yet enabled git-svn-id: http://svn.osgeo.org/qgis/trunk@13154
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix next edge label direction arrows
+    
+    Basically uses direction indicator for the next_left but omits
+    it for the next_right (would require backward direction)
+    
+    Also this commit sets the line color, even if fully transparent,
+    for the sake of showing a color which corresponds to the label
+    color (would be better to have support for a "label" kind of icon
+    in the legend..)
 
-2010-03-23  cfarmer 
+Sandro Santilli 	2012-11-08
 
-	* python/plugins/fTools/tools/doDefineProj.py: fixes issue with
-	identical input CRSs, now asks if users wants to proceed anyway git-svn-id: http://svn.osgeo.org/qgis/trunk@13152
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Split edge layer into "edge" and "edge label"
+    
+    Mind you: you may need to re-run cmake as a filename changed
 
-2010-03-23  jef 
+Larry Shaffer 	2012-11-08
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13151
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix for #6658, update duplicateLayers() to work around odd layer group segfault bug
+    
+    - Move QgsLegend::findLegendLayer() methods to public
 
-2010-03-23  jef 
+Matthias Kuhn 	2012-11-08
 
-	* src/app/qgswmssourceselect.cpp,
-	src/providers/wms/qgswmsprovider.cpp: use SE corner as WMS-C origin,
-	wms metadata display & selection cosmetics git-svn-id: http://svn.osgeo.org/qgis/trunk@13150
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    No need to register QgsStringRelay with Qt Meta Type
 
-2010-03-23  jef 
+Victor Olaya 	2012-11-08
 
-	* src/gui/qgsprojectionselector.cpp: more case-insensitive
-	projection searches git-svn-id: http://svn.osgeo.org/qgis/trunk@13149
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed missing scripts folder
 
-2010-03-23  mhugent 
+Matthias Kuhn 	2012-11-08
 
-	*
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h: Forgot to commit the header git-svn-id: http://svn.osgeo.org/qgis/trunk@13148
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add python bindings for setEditorLayout
 
-2010-03-23  mhugent 
+Matthias Kuhn 	2012-11-08
 
-	*
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.h,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidgetbase.ui: Add distance parameter for point displacement to the
-	gui git-svn-id: http://svn.osgeo.org/qgis/trunk@13147
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Attribute Editor: Synchronize editable QComboBox for LineEdit's and similar.
+    Fixes http://hub.qgis.org/issues/6647
 
-2010-03-23  jef 
+Marco Hugentobler 	2012-11-08
 
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13146
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Ticket #6643 Interpolation plugin: the option to load a layer after analyses should be on by default
 
-2010-03-23  jef 
+Larry Shaffer 	2012-11-07
 
-	* src/gui/qgsprojectionselector.cpp: search case-insensitive for
-	authorities git-svn-id: http://svn.osgeo.org/qgis/trunk@13145
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add letter and word spacing to curved labels for line layers
+    
+    - Curved spacings match Qt-produced spacings for parallel (and other) labels
+    - Remove redundant letter/word resetting in options gui
+    - Remove on-fly adjustments to spinbox steps (only made sense with UTM, not LatLong)
 
-2010-03-23  jef 
+Sandro Santilli 	2012-11-08
 
-	* src/plugins/diagram_overlay/CMakeLists.txt,
-	src/plugins/point_displacement_renderer/CMakeLists.txt: fix build
-	error git-svn-id: http://svn.osgeo.org/qgis/trunk@13144
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Split node layer into "node" and "node label"
 
-2010-03-22  jef 
+Victor Olaya 	2012-11-08
 
-	* src/app/qgisapp.cpp, src/app/qgsoptions.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.cpp, src/providers/wms/qgswmsprovider.cpp,
-	src/ui/qgsoptionsbase.ui: remove Qt 4.5 dependencies git-svn-id: http://svn.osgeo.org/qgis/trunk@13143
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Harcoded example folder for models and scripts
+    fixed bugs in mmqgis library.
 
-2010-03-22  macho 
+Juergen E. Fischer 	2012-11-07
 
-	* i18n/qgis_el_GR.ts: translation update: el_GR by Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13142
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    osgeo4w: fix crssync run if installed into a directory with blanks
 
-2010-03-22  wonder 
+Sandro Santilli 	2012-11-07
 
-	* INSTALL, doc/INSTALL.t2t: Updated versions of build dependencies git-svn-id: http://svn.osgeo.org/qgis/trunk@13141
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix layer visibility settings
 
-2010-03-22  kyngchaos 
+Victor Olaya 	2012-11-07
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: displacement plugin
-	(r13139) git-svn-id: http://svn.osgeo.org/qgis/trunk@13140
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    restructured admintools (was geoservertools)
 
-2010-03-21  mhugent 
+Alexander Bruy 	2012-11-07
 
-	* src/plugins/CMakeLists.txt,
-	src/plugins/point_displacement_renderer/CMakeLists.txt,
-	src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp,
-	src/plugins/point_displacement_renderer/qgsdisplacementplugin.h,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	r.h,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.cpp,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidget.h,
-	src/plugins/point_displacement_renderer/qgspointdisplacementrendere
-	rwidgetbase.ui: [FEATURE]: Add point displacement renderer plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@13139
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    create directories for models and R script in user folder
 
-2010-03-21  borysiasty 
+Larry Shaffer 	2012-11-07
 
-	* : better icon for grass tools (by Robert and Markus) git-svn-id: http://svn.osgeo.org/qgis/trunk@13138
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update QgsMessageBar sip binding
 
-2010-03-21  mhugent 
+Larry Shaffer 	2012-11-07
 
-	* src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.h: Make _getPoint,
-	_getLineString, _getPolygon visible for subclasses of feature
-	renderer git-svn-id: http://svn.osgeo.org/qgis/trunk@13137
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to QgsMessageBar stylesheet
 
-2010-03-21  mhugent 
+Tim Sutton 	2012-11-07
 
-	* python/core/symbology-ng-core.sip: don't forget the python
-	bindings git-svn-id: http://svn.osgeo.org/qgis/trunk@13136
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Enabled some tests that werent running because they missed test prefix in method name. Better error messages for failing tests
 
-2010-03-21  mhugent 
+Radim Blazek 	2012-11-07
 
-	* src/core/symbology-ng/qgsrendererv2.h,
-	src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp: Make
-	renderFeature method virtual. More safety checks in the renderer
-	props dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@13135
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    vector save as: separated MITAB and MIF formats, fixes #6233; added test if OGR SpatiaLite is available
 
-2010-03-21  jef 
+Marco Hugentobler 	2012-11-07
 
-	* src/gui/qgsprojectionselector.cpp: fix projections selection when
-	CRSes from multiple authorities are preselected git-svn-id: http://svn.osgeo.org/qgis/trunk@13134
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Ticket #6644 terrain analysis plugin: the option to load a layer after analyses should be on by default
 
-2010-03-21  jef 
+Marco Hugentobler 	2012-11-07
 
-	* src/app/qgisapp.cpp, src/app/qgswmssourceselect.cpp,
-	src/app/qgswmssourceselect.h: fix style selection in wms dialog (and
-	a memory leak) git-svn-id: http://svn.osgeo.org/qgis/trunk@13133
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix bug #6582: QGIS server displayes text layers only with absolute pathes
 
-2010-03-21  jef 
+Juergen E. Fischer 	2012-11-07
 
-	* : fix auth_id field type in srs.db git-svn-id: http://svn.osgeo.org/qgis/trunk@13129
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix some attribute editor signals
 
-2010-03-21  pcav 
+Juergen E. Fischer 	2012-11-07
 
-	* src/plugins/grass/modules-common/r.shaded.relief.qgm: Updated
-	r.shaded.relief GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@13127
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix layer extent calculation
 
-2010-03-21  jef 
+Larry Shaffer 	2012-11-05
 
-	* src/core/composer/qgslegendmodel.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@13126
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to QgsMessageBar and duplicateLayers()
+    
+    - Move project macros message into project open method (as app property, partially showed behind later messages)
+    - Support for multi-line messages that also wrap at with canvas window width
+    - Update text stylesheets to handle all text styling
+    - Show count of remaining queued messages
+    - Add popup menu to Close button with action to optionally close all messages at once
+    - Add slot to clear all widgets, called on project close
+    - Update QgisApp::duplicateLayers() to use QgsMessageBar instead of popup dialogs
 
-2010-03-20  jef 
+Etienne Tourigny 	2012-11-06
 
-	* src/gui/qgsprojectionselector.cpp,
-	src/gui/qgsprojectionselector.h,
-	src/ui/qgsprojectionselectorbase.ui: [FEATURE] allow to hide
-	deprecated CRSes git-svn-id: http://svn.osgeo.org/qgis/trunk@13125
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add QgsApplication::upgradeConfig to upgrade any configs that changed from 1.8
+    use different keys for scanItemsInBrowser and scanZipInBrowser in qgis-1.9 because new storage type (string vs. int) causes conflicts with 1.8
 
-2010-03-20  jef 
+Radim Blazek 	2012-11-06
 
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13124
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    vector feature counts moved to vector layer, enabled feature counts in composer legend, fixes #6237
 
-2010-03-20  pcav 
+Juergen E. Fischer 	2012-11-06
 
-	* i18n/qgis_it.ts: More IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13123
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    make html print option more visible in identify tool
 
-2010-03-20  mhugent 
+Juergen E. Fischer 	2012-11-06
 
-	* src/app/qgsmaptooladdfeature.cpp: Remove the error dialog if using
-	the add feature tool on 25d shapefiles git-svn-id: http://svn.osgeo.org/qgis/trunk@13122
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missing GUI_EXPORT to QgsSvgAnnotationItem
 
-2010-03-20  jef 
+Merge: f410e38 550a2c6
+Marco Hugentobler 	2012-11-06
 
-	* src/core/raster/qgsrasterlayer.cpp: start raster selection with
-	all files instead of VRT git-svn-id: http://svn.osgeo.org/qgis/trunk@13121
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE]: svg- and text items can be used as watermarks in QGIS server. Developed for Faunalia ( http://www.faunalia.it) with funding from Regione Toscana \- Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-20  mhugent 
+Victor Olaya 	2012-11-06
 
-	* src/core/composer/qgslegendmodel.cpp: fix memory leak git-svn-id: http://svn.osgeo.org/qgis/trunk@13119
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added missing cmake files
+    fixed bug in execution dialog when running iterative algorithms
 
-2010-03-20  mhugent 
+Merge: a2e6a48 ff78ef1
+Victor Olaya 	2012-11-06
 
-	* src/core/composer/qgscomposerlegend.cpp,
-	src/core/composer/qgscomposerlegend.h,
-	src/core/composer/qgslegendmodel.cpp,
-	src/core/composer/qgslegendmodel.h: Added symbology-ng capability to
-	composer legend git-svn-id: http://svn.osgeo.org/qgis/trunk@13118
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-03-20  macho 
+Marco Hugentobler 	2012-11-05
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation updates: deleted obsolete
-	translations git-svn-id: http://svn.osgeo.org/qgis/trunk@13115
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Save / restore settings for annotation tools. Developed for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-20  pcav 
+Marco Hugentobler 	2012-11-05
 
-	* i18n/qgis_it.ts: More IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13114
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consistent names for Svg classes. Developed for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-20  mhugent 
+Marco Hugentobler 	2012-11-05
 
-	* src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgscategorizedsymbolrendererv2.h,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp,
-	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h,
-	src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.h,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp,
-	src/core/symbology-ng/qgssinglesymbolrendererv2.h: Add method that
-	returns legend item text and symbol pointers to v2 renderers git-svn-id: http://svn.osgeo.org/qgis/trunk@13113
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QGIS server: ignore svg items not fixed to pixel position. Developed for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-20  jef 
+Marco Hugentobler 	2012-11-05
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13111
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Print svg item in qgis server. Developed for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-20  jef 
+Juergen E. Fischer 	2012-11-06
 
-	* src/app/qgsoptions.cpp, src/ui/qgsoptionsbase.ui: hide url
-	exclusion for Qt<4.5 git-svn-id: http://svn.osgeo.org/qgis/trunk@13110
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build error (please stick with C++)
 
-2010-03-20  kyngchaos 
+Larry Shaffer 	2012-11-05
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: proxy exclusion
-	(r13103); translation updates git-svn-id: http://svn.osgeo.org/qgis/trunk@13108
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Set transparent background only for Close tool button, instead of also for tool tip
 
-2010-03-20  jef 
+Victor Olaya 	2012-11-06
 
-	* src/ui/qgspluginmanagerbase.ui: apply plugin manager patch from
-	Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13106
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    code cleaning
 
-2010-03-20  jef 
+volaya 	2012-11-05
 
-	* python/plugins/fTools/tools/doVectorGrid.py: fix vector grid git-svn-id: http://svn.osgeo.org/qgis/trunk@13105
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update python/plugins/sextante/CMakeLists.txt
+    
+    added servertools folder to cmakelists
 
-2010-03-20  jef 
+Radim Blazek 	2012-11-05
 
-	* i18n/qgis_de.ts: translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13104
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed warning
 
-2010-03-20  jef 
+Larry Shaffer 	2012-11-05
 
-	* src/app/CMakeLists.txt, src/app/qgisapp.cpp,
-	src/app/qgsnetworkproxyfactory.cpp,
-	src/app/qgsnetworkproxyfactory.h, src/app/qgsoptions.cpp: re-enable
-	proxy exclusion git-svn-id: http://svn.osgeo.org/qgis/trunk@13103
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add Atlas generation dock to Composer's View->Panels menu
 
-2010-03-20  jef 
+Merge: d53f123 5de2fee
+Victor Olaya 	2012-11-05
 
-	* src/app/qgisapp.cpp: fix proxy settings git-svn-id: http://svn.osgeo.org/qgis/trunk@13101
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-03-20  borysiasty 
+Victor Olaya 	2012-11-05
 
-	* python/utils.py: better names for plugin help files:
-	index-ll_CC.html or index-ll.html git-svn-id: http://svn.osgeo.org/qgis/trunk@13100
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-20  borysiasty 
-
-	* python/utils.py: new utils.showPluginHelp() method - patch #2562
-	by ccrook applied git-svn-id: http://svn.osgeo.org/qgis/trunk@13097
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-20  jef 
-
-	* src/core/raster/qgsrasterlayer.cpp: follow up r13093 git-svn-id: http://svn.osgeo.org/qgis/trunk@13094
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    cleaned code in geoserver algs
 
-2010-03-20  jef 
+Radim Blazek 	2012-11-05
 
-	* scripts/postprocess_srs.sql, scripts/qgis_srs.sh,
-	src/app/qgisapp.cpp, src/app/qgisapp.h, src/app/qgsoptions.cpp,
-	src/app/qgsoptions.h, src/app/qgswmssourceselect.cpp,
-	src/app/qgswmssourceselect.h, src/core/qgis.h,
-	src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgscoordinatereferencesystem.h,
-	src/core/qgsdataprovider.h, src/core/qgsdistancearea.cpp,
-	src/core/qgsmaplayer.cpp, src/core/qgsmaplayer.h,
-	src/core/qgsmaprenderer.cpp, src/core/raster/qgsrasterlayer.cpp,
-	src/gui/qgsgenericprojectionselector.cpp,
-	src/gui/qgsgenericprojectionselector.h,
-	src/gui/qgsprojectionselector.cpp, src/gui/qgsprojectionselector.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselect.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/wfs/qgswfsdata.cpp,
-	src/providers/wfs/qgswfsprovider.cpp,
-	src/providers/wms/qgswmsprovider.cpp,
-	src/providers/wms/qgswmsprovider.h, src/ui/qgsoptionsbase.ui,
-	src/ui/qgsprojectionselectorbase.ui,
-	src/ui/qgswmssourceselectbase.ui: [FEATURE] WMS-C support, new
-	spatial authorities, wms selection improvements - QgsDataProvider&QgsMapLayer: add dataChanged() signal, so that a
-	provider can signal that the datasource changed - use QNetworkAccessManager instead of QgsHttpTransaction (including
-	  caching and dynamic authentification to website and proxies) - resolve EPSG dependency in spatial reference systems and   included french IGNF definitions in srs.db - wms provider:   - do request asynchronously through QNetworkAccessManager   - add support for WMS-C   - dataChanged() is to cause a redraw asynchronously, when new
-	  tiles arrive - wms selection:   - add support for WMS-C tilesets   - allow inserting of all layers of a branch   - add support for more mime types   - move load/save to button box   - and more cleanups - raster provider: reduce debugging noise - allow adding parts to multi points and lines git-svn-id: http://svn.osgeo.org/qgis/trunk@13093
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add total feature count in legend, fixes #3402
 
-2010-03-20  mhugent 
+Victor Olaya 	2012-11-05
 
-	* src/app/gps/qgsgpsinformationwidget.cpp: Delete on a 0 pointer is
-	save git-svn-id: http://svn.osgeo.org/qgis/trunk@13092
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6571, #6619 and problem with missing arrows in modeler
+    added first draft of geoserver tools
+    nviz is back in grass tools
 
-2010-03-20  macho 
+Etienne Tourigny 	2012-11-05
 
-	* i18n/qgis_el_GR.ts, i18n/qgis_pl_PL.ts: translation update: pl by
-	milena and gr by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@13091
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    check for existence of icon file in plugin manager
 
-2010-03-19  borysiasty 
+Juergen E. Fischer 	2012-11-05
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py: plugin installer
-	fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13090
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-03-19  timlinux 
+Juergen E. Fischer 	2012-11-05
 
-	* src/app/gps/qgsgpsinformationwidget.cpp: Bugfix for gps info
-	widget crashing. Gettings to all in Piza git-svn-id: http://svn.osgeo.org/qgis/trunk@13089
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    allow saving single geometries as multi geometries
 
-2010-03-19  borysiasty 
+Juergen E. Fischer 	2012-11-05
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py: Plugin Installer
-	fix (prevent some depreciation warnings) git-svn-id: http://svn.osgeo.org/qgis/trunk@13087
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add CORE_EXPORT to QgsAttributeEditorElement/QgsAttributeEditorContainer/QgsAttributeEditorField
 
-2010-03-19  borysiasty 
+Sandro Santilli 	2012-11-05
 
-	* python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py: Patch #2422
-	applied git-svn-id: http://svn.osgeo.org/qgis/trunk@13086
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Only change the TopoGeometry definition, not its reference, on edit
+    
+    Refactor the TopoGeometry editor to avoid touching the edited table
+    and directly act on the topology relation instead. Fixes #6621 but
+    also generally makes less writes to the database.
 
-2010-03-19  dassau 
+Sandro Santilli 	2012-11-05
 
-	* doc/index.html: added prominent link to pdf manual webpage git-svn-id: http://svn.osgeo.org/qgis/trunk@13083
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Start all topology layers as invisible (it may cost really a lot to visualize...)
 
-2010-03-19  macho 
+Sandro Santilli 	2012-11-05
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fi.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts, src/ui/qgsabout.ui,
-	src/ui/qgsidentifyresultsbase.ui: some ui bugs hunted and the usual
-	hackfest string update for translation files :) git-svn-id: http://svn.osgeo.org/qgis/trunk@13081
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add alias to pk query, fixing ambiguous "ctid" reference (#6620)
 
-2010-03-19  jef 
+Juergen E. Fischer 	2012-11-05
 
-	* src/analysis/interpolation/Vector3D.h,
-	src/analysis/vector/qgszonalstatistics.cpp: fix some warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@13080
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-03-19  jef 
+Merge: 08b05f3 38f82d3
+Giuseppe Sucameli 	2012-11-04
 
-	* src/app/qgsnewvectorlayerdialog.cpp,
-	src/app/qgsnewvectorlayerdialog.h: add sanity checks to new vector
-	dialog and some cleanups git-svn-id: http://svn.osgeo.org/qgis/trunk@13079
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #316 from slarosa/master
+    
+    Minor changes for layout in console
 
-2010-03-19  macho 
+Salvatore Larosa 	2012-11-04
 
-	* i18n/qgis_fi.ts: updated finnish translation file git-svn-id: http://svn.osgeo.org/qgis/trunk@13078
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    minor changes for layout in console:
+    - moved header text in output area
+    - add default value to True for Use preloaded API option in settings dialog
+    - include traceback to codepad link
 
-2010-03-19  jef 
+Juergen E. Fischer 	2012-11-04
 
-	* src/core/qgsvectorlayer.cpp: clear layer rendering cache after
-	appling a subset string git-svn-id: http://svn.osgeo.org/qgis/trunk@13077
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix debug build
 
-2010-03-19  wonder 
+Matthias Kuhn 	2012-11-04
 
-	* qgis.1, src/app/main.cpp, src/app/qgisapp.cpp, src/app/qgisapp.h: 
-	[FEATURE] Added --noplugins command line options to avoid restoring
-	the plugins. Useful when a plugin misbehaves and causes QGIS to
-	crash during startup.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13076
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merged Squashed pull request #296 (tabs and groups for feature form)
 
-2010-03-19  jef 
+Juergen E. Fischer 	2012-11-04
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@13075
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build (CORE_EXPORT missing from QgsDirectoryParamWidget)
 
-2010-03-19  jef 
+Giuseppe Sucameli 	2012-11-04
 
-	* src/app/attributetable/qgsattributetabledialog.cpp,
-	src/app/attributetable/qgsattributetablemodel.cpp: show feature
-	count in attribute table title git-svn-id: http://svn.osgeo.org/qgis/trunk@13074
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    grass plugin: avoid garbled japanese/cyrillic chars in the tools' GUI (fix #4547, #3164)
+    
+    Thanks Minoru Akagi for patches!
 
-2010-03-18  pcav 
+Merge: 6ecfc29 ed4bc25
+Giuseppe Sucameli 	2012-11-03
 
-	* i18n/qgis_it.ts: More IT translation fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@13073
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #314 from slarosa/master
+    
+    [FEATURE] Sharing snippets code from PyQGIS console
 
-2010-03-18  mhugent 
+Etienne Tourigny 	2012-11-03
 
-	* python/core/qgsvectorfilewriter.sip,
-	src/app/legend/qgslegendlayer.cpp, src/app/legend/qgslegendlayer.h,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h: 
-	Apply patch #2452 (save as vector) git-svn-id: http://svn.osgeo.org/qgis/trunk@13072
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add missing ui file, fix typo
 
-2010-03-18  jef 
+Etienne Tourigny 	2012-11-03
 
-	* src/app/legend/qgslegend.cpp, src/app/qgsoptions.cpp,
-	src/ui/qgsoptionsbase.ui: [FEATURE] optionally add new layers to the
-	selected group git-svn-id: http://svn.osgeo.org/qgis/trunk@13071
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    browser dock filter: use QgsFilterLineEdit, ui and code cleanup ; add QgsFilterLineEdit::cleared() signal
 
-2010-03-18  pcav 
+Etienne Tourigny 	2012-04-11
 
-	* debian/control, i18n/qgis_it.ts: First round of updates to the IT
-	translation git-svn-id: http://svn.osgeo.org/qgis/trunk@13070
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add directory properties dialog to browser dock
 
-2010-03-18  mhugent 
+Etienne Tourigny 	2012-04-05
 
-	* i18n/qgis_fi.ts: added empty finnish translation file git-svn-id: http://svn.osgeo.org/qgis/trunk@13069
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    browser filter
 
-2010-03-18  jef 
+Etienne Tourigny 	2012-04-11
 
-	* src/providers/grass/qgsgrass.cpp: don't add PATH to PYTHONPATH git-svn-id: http://svn.osgeo.org/qgis/trunk@13068
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    do not populate items in rowCount(), use canFetchMore() and fetchMore() instead
 
-2010-03-17  macho 
+Etienne Tourigny 	2012-04-03
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@13067
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Browser: change Add Layers and Refresh buttons ; use designer file for qgsbrowserdock
 
-2010-03-17  borysiasty 
+Juergen E. Fischer 	2012-11-03
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@13066
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-03-17  wonder 
+Juergen E. Fischer 	2012-11-03
 
-	* python/core/qgsgeometry.sip, src/core/qgsgeometry.cpp,
-	src/core/qgsgeometry.h: Added missing QgsGeometry::contains
-	predicate.  Contributed by Jeremy Palmer (#2560).  git-svn-id: http://svn.osgeo.org/qgis/trunk@13065
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    apply revised #6613
 
-2010-03-16  rblazek 
+Juergen E. Fischer 	2012-11-03
 
-	* src/providers/grass/qgis.d.rast.c: read window from map git-svn-id: http://svn.osgeo.org/qgis/trunk@13064
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    partly fix #6610
 
-2010-03-16  jef 
+Larry Shaffer 	2012-11-03
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: fix
-	crash when moving layers git-svn-id: http://svn.osgeo.org/qgis/trunk@13063
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to duplicate layer(s)
+    
+    - Better information about unsupported types
+    - Action unavailable in contextual menu for individually selected unsupported layers
 
-2010-03-16  pcav 
+Salvatore Larosa 	2012-11-03
 
-	* SPONSORS: Updated SPONSORS list git-svn-id: http://svn.osgeo.org/qgis/trunk@13062
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    removed shortcut for sharing code action
 
-2010-03-15  jef 
+Salvatore Larosa 	2012-11-03
 
-	* src/app/ogr/qgsogrsublayersdialog.cpp: fix #2556 git-svn-id: http://svn.osgeo.org/qgis/trunk@13061
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] - Sharing snippets code from PyQGIS console
+    - now you can share snippets code by codepad.org
+    - added much more actions in contextual menu
 
-2010-03-15  rblazek 
+Juergen E. Fischer 	2012-11-03
 
-	* INSTALL, doc/INSTALL.t2t: GDAL-GRASS driver no more necessary, new
-	requirement: exceptions support for GRASS git-svn-id: http://svn.osgeo.org/qgis/trunk@13060
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    allow printing of html results in identify window (implements #6575)
 
-2010-03-15  jef 
+Werner Macho 	2012-11-03
 
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: fix #2555 git-svn-id: http://svn.osgeo.org/qgis/trunk@13059
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    adjust translation update script to reflect changes for console
 
-2010-03-15  rblazek 
+Werner Macho 	2012-11-03
 
-	* src/plugins/grass/qgis.g.browser.cpp: another atempt to get it
-	working on Windows git-svn-id: http://svn.osgeo.org/qgis/trunk@13058
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: gl_ES by Xan
 
-2010-03-15  rblazek 
+Giuseppe Sucameli 	2012-11-03
 
-	* src/providers/grass/qgsgrass.cpp: set default GRASS_GUI git-svn-id: http://svn.osgeo.org/qgis/trunk@13057
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix crashes using uninitialized geometries with GEOS functions,
+    ensure geos geometries are up to date when passed to GEOS functions
 
-2010-03-15  jef 
+Sandro Santilli 	2012-11-02
 
-	* src/app/qgsabout.cpp: fix crash in about box git-svn-id: http://svn.osgeo.org/qgis/trunk@13056
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix bug introduced by reordering postgis table metadata info cols
+    
+    Thanks jef :)
 
-2010-03-15  jef 
+Sandro Santilli 	2012-11-02
 
-	* python/utils.py, src/python/qgspythonutilsimpl.cpp: followup
-	r13013 and implement #2539 git-svn-id: http://svn.osgeo.org/qgis/trunk@13055
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reorder and rename postgis layers metadata columns shown in selector
 
-2010-03-14  macho 
+Alexander Bruy 	2012-11-01
 
-	* i18n/qgis_el_GR.ts, src/ui/qgsabout.ui: translation update gr by
-	mike and small ui improvements in about box git-svn-id: http://svn.osgeo.org/qgis/trunk@13054
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use new lineedit widget in several dialogs
 
-2010-03-14  borysiasty 
+Alexander Bruy 	2012-11-01
 
-	* i18n/qgis_pl_PL.ts,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp: Georeferencer fix:
-	do not translate GDAL parameter strings git-svn-id: http://svn.osgeo.org/qgis/trunk@13053
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] add lineedit with builtin clear button
 
-2010-03-13  pcav 
+Sandro Santilli 	2012-11-02
 
-	* SPONSORS: Modified SPONSORS list git-svn-id: http://svn.osgeo.org/qgis/trunk@13052
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use "TopoGeometry" as the datatype for topogeometries
+    
+    "Topology" is too generic, as also the primitive tables (edges,
+    nodes and faces) are part of the topology
 
-2010-03-13  pcav 
+Marco Hugentobler 	2012-10-31
 
-	* DONORS, SPONSORS: Added SPONSORS and DONORS git-svn-id: http://svn.osgeo.org/qgis/trunk@13051
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE]: Use text annotations as watermarks in QGIS server. Developed for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 
-2010-03-12  borysiasty 
+Sandro Santilli 	2012-11-02
 
-	* python/utils.py, src/app/qgspluginmanager.cpp,
-	src/python/qgspythonutils.h, src/python/qgspythonutilsimpl.cpp,
-	src/python/qgspythonutilsimpl.h: [FEATURE] Applied patch #2541 -
-	initial implementing the canBeUninstalled python plugin method git-svn-id: http://svn.osgeo.org/qgis/trunk@13050
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Retain old TopoGeometry id on editing
+    
+    Avoids leaving orphaned TopoGeometry objects and breaking
+    upper hirearchical  layers
 
-2010-03-11  borysiasty 
+Giuseppe Sucameli 	2012-11-02
 
-	* src/ui/qgscomposerarrowwidgetbase.ui, src/ui/qgscomposerbase.ui,
-	src/ui/qgscomposermapwidgetbase.ui: Print composer gui cleanups from
-	Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13049
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update remove/duplicate layer actions at startup
 
-2010-03-11  mhugent 
+Giuseppe Sucameli 	2012-11-02
 
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h: Applied
-	patch #2492 provided by audun git-svn-id: http://svn.osgeo.org/qgis/trunk@13048
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    sextante: fix NameError (undefined var) executing GRASS commands
 
-2010-03-11  jef 
+Larry Shaffer 	2012-11-02
 
-	* src/gui/qgsmapcanvas.cpp: fix #2543 git-svn-id: http://svn.osgeo.org/qgis/trunk@13047
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to duplicate layer(s)
+    
+    - Duplicate layer always created below source layer, and at same nested group depth
+    - Duplicate layer is always set to not visible (much faster, canvas refresh not needed when duplicating many layers)
 
-2010-03-11  mhugent 
-
-	* src/app/qgsfieldcalculator.cpp: Change default behaviour of field
-	calculator dialog (fixes ticket #2542) git-svn-id: http://svn.osgeo.org/qgis/trunk@13046
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-11  mhugent 
-
-	* src/app/main.cpp: Add option to set QSettings path git-svn-id: http://svn.osgeo.org/qgis/trunk@13045
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  jef 
-
-	* python/core/qgsdatasourceuri.sip,
-	src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/app/qgsmanageconnectionsdialog.cpp,
-	src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h,
-	src/ui/qgspgnewconnectionbase.ui: apply #2460 (slightly modified).
-	Thanks Jeremy Palmer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13044
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  jef 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: fix translation
-	string git-svn-id: http://svn.osgeo.org/qgis/trunk@13043
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  jef 
-
-	* src/app/composer/qgscomposer.cpp, src/app/main.cpp,
-	src/app/qgsattributeactiondialog.cpp, src/app/qgsquerybuilder.cpp,
-	src/app/qgssearchquerybuilder.cpp, src/app/qgssearchquerybuilder.h,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/qgshttptransaction.cpp, src/gui/qgisgui.h,
-	src/gui/qgsattributeeditor.cpp, src/gui/qgscolorbutton.cpp,
-	src/plugins/copyright_label/plugingui.cpp,
-	src/plugins/grass/qgsgrassnewmapset.cpp,
-	src/plugins/grass/qtermwidget/KeyboardTranslator.h,
-	src/plugins/quick_print/quickprintgui.cpp: remove #ifdefs related to
-	no longer supported Qt versions git-svn-id: http://svn.osgeo.org/qgis/trunk@13042
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  jef 
-
-	* src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.h,
-	src/plugins/georeferencer/qgsgcplist.cpp,
-	src/plugins/georeferencer/qgsgcplist.h,
-	src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistmodel.h,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.h,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.h,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefdelegates.cpp,
-	src/plugins/georeferencer/qgsgeorefdelegates.h,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialog.h,
-	src/plugins/georeferencer/qgsgeorefplugin.cpp,
-	src/plugins/georeferencer/qgsgeorefplugin.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.h,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.h,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h,
-	src/plugins/georeferencer/qgsgeorefvalidators.cpp,
-	src/plugins/georeferencer/qgsgeorefvalidators.h,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsimagewarper.h,
-	src/plugins/georeferencer/qgsmapcoordsdialog.cpp,
-	src/plugins/georeferencer/qgsmapcoordsdialog.h,
-	src/plugins/georeferencer/qgsopenrasterdialog.cpp,
-	src/plugins/georeferencer/qgsopenrasterdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgsvalidateddoublespinbox.h: reindent
-	georeferencer plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@13041
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doGeoprocessing.py: Fixes error
-	message for all Geoprocessing functions, now provides more useful
-	information.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13040
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doJoinAttributes.py: Join attributes
-	tool now supports both dbf and csv files. Uses OGR provider to read
-	tabular information (a bit of a hack, but it seems to work).  Should
-	be slightly faster, and more robust to different file encodings and
-	formats...  git-svn-id: http://svn.osgeo.org/qgis/trunk@13039
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doGeoprocessing.py: Union now supports
-	all vector data types. This has not been extensively tested, and may
-	produce odd results in some cases.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13038
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doMeanCoords.py,
-	python/plugins/fTools/tools/doPointsInPolygon.py,
-	python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/doRandom.py,
-	python/plugins/fTools/tools/doReProject.py,
-	python/plugins/fTools/tools/doRegPoints.py,
-	python/plugins/fTools/tools/doSelectByLocation.py,
-	python/plugins/fTools/tools/doSubsetSelect.py,
-	python/plugins/fTools/tools/doSumLines.py,
-	python/plugins/fTools/tools/doVectorGrid.py,
-	python/plugins/fTools/tools/doVectorSplit.py,
-	python/plugins/fTools/tools/frmRandom.ui,
-	python/plugins/fTools/tools/frmSubsetSelect.ui,
-	python/plugins/fTools/tools/ftools_utils.py: Large commit with
-	several related bug fixes: 1) All fTools functions should now add all layers to dropdowns
-	(including non-visible layers), 2) All fTools functions should now be non-modal 3) Several fTools functions have been spead up slightly 4) Where possible, internal (cpp) functions have be used to replace
-	older Python functions 5) Defining projections now also considers .qpj files Fixes bugs
-	#2502 and #2506, and possibly others? git-svn-id: http://svn.osgeo.org/qgis/trunk@13037
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doSpatialJoin.py: Uses spatial index
-	to select intersecting features (used selections before). Tool
-	should run faster and with fewer map canvas glitches.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13036
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-10  cfarmer 
-
-	* python/plugins/fTools/tools/doIntersectLines.py,
-	python/plugins/fTools/tools/doPointsInPolygon.py: Uses spatial index
-	to select intersecting features (used selections before). Tools
-	should both run faster and with fewer map canvas glitches.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13035
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-09  cfarmer 
-
-	* python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/ftools_utils.py: Uses Qt functions to
-	determine output file name and path correctly (all? ftools output
-	files should now be loaded with correct layer name). Fixes #2498.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13034
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-09  cfarmer 
-
-	* python/plugins/fTools/tools/doGeometry.py: Simplify geometry tool
-	now works properly for multipart features. Note: tool now uses
-	builtin simplify function from QgsGeometry (i.e. should be
-	noticeably faster). Fixes #2493 and #2499.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13033
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-08  cfarmer 
-
-	* python/plugins/fTools/tools/doGeoprocessing.py: Fixes bug which
-	only computed the convex hull of features within the current extent
-	(i.e. entire extent of layer is now used: as expected). Fixes #2507.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13032
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-03-08  cfarmer 
-
-	* python/plugins/fTools/tools/doVisual.py: Fixes crash when 'use
-	selected' checkbox is check but no features are selected. Fixes
-	#2504.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13031
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 70fc8ca 2425f92
+Giuseppe Sucameli 	2012-11-02
 
-2010-03-08  cfarmer 
+    Merge pull request #313 from slarosa/master
+    
+    Automatically switch focus to the input area in console
 
-	* python/plugins/fTools/tools/doMeanCoords.py: Means for unique
-	values now properly calculated. Fixes #2509.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13030
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-11-02
 
-2010-03-08  borysiasty 
+    automatically switch focus to the  input area in console
+    - any keystroke switch focus when in the output area
+    - moved closeEvent method to DockWidget (since 0330202 it has not worked anymore)
 
-	* i18n/qgis_pl_PL.ts: translation update: pl from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@13029
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-11-02
 
-2010-03-08  cfarmer 
+    WMS server GetLegendGraphics: differentiate between layer space and layer title space
 
-	* python/plugins/fTools/tools/doVisual.py,
-	python/plugins/fTools/tools/frmVisual.ui: Basic statistics tool
-	should no longer crash with PostGIS layers. Also adds support for
-	varchar, char, and text fields (PostGIS layers). Should fix #2510 git-svn-id: http://svn.osgeo.org/qgis/trunk@13028
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-31
 
-2010-03-08  cfarmer 
+    [FEATURE] Duplicate map layer(s)
+    
+    - Action available in Layer menu and legend contextual menu
+    - Layer style copy/pasted to duplicate
+    - Memory and plugin layers skipped
+    - Add sip binding to action in app interface
 
-	* python/plugins/fTools/tools/doPointDistance.py: Names in dropdown
-	lists are now correctly cleared when changing between layers. Fixes
-	#2505 git-svn-id: http://svn.osgeo.org/qgis/trunk@13027
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-11-01
 
-2010-03-08  cfarmer 
+    show filled attribute table again (partly reverts 779e16603)
 
-	* python/plugins/fTools/tools/doDefineProj.py: oops, didn't see
-	patch, patch implementation more elegant (qt-ish), thanks alexbruy git-svn-id: http://svn.osgeo.org/qgis/trunk@13026
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-11-01
 
-2010-03-08  cfarmer 
+    Do not drop schema name from URI, even if it's the same as current
+    
+    The dropping was done in 2007 to workaround a bug which was elsewhere
+    (in OGR usage, as reported in #843). I guess by now everything
+    would work transparently, but if it doesn't it'd be time to fix it
+    for real.
+    
+    This commit fixes bug #6599, making life harder for NON-BOGUS code
+    which isn't confused by schemas...
+    
+    Please test !
 
-	* python/plugins/fTools/tools/doDefineProj.py: Adding projection
-	information (prj-file) no longer throws an error if folder has
-	cyrillics. Fixes #2501.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13025
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-11-01
 
-2010-03-08  cfarmer 
+    TopoViewer: add layer for full faces
 
-	* python/plugins/fTools/tools/doSelectByLocation.py: reactivate
-	select by location progress bar. Fixes #2517; Thanks to alexbruy for
-	the patch! git-svn-id: http://svn.osgeo.org/qgis/trunk@13024
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-11-01
 
-2010-03-08  jef 
+    TopoViewer: only use queries for layers when really needed
 
-	* src/core/qgssearchstringlexer.ll,
-	src/core/qgssearchstringparser.yy, src/core/qgssearchtreenode.cpp,
-	src/core/qgssearchtreenode.h: [FEATURE] support NULL values in
-	search strings (fixes #2533) git-svn-id: http://svn.osgeo.org/qgis/trunk@13023
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: dbea359 6abe861
+Giuseppe Sucameli 	2012-11-01
 
-2010-03-08  cfarmer 
+    Merge pull request #312 from slarosa/master
+    
+    Moved all the console files into own directory
 
-	* python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/doRegPoints.py: Both tools now uses
-	project crs instead of None (or input vector layer if selected in
-	regular points). Fixes #2494.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13022
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-11-01
 
-2010-03-08  cfarmer 
+    Moved all the console files into own directory
 
-	* python/plugins/fTools/tools/doVectorGrid.py: Vector grid tool now
-	uses project crs instead of None. Fixes #2494.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13021
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-11-01
 
-2010-03-08  cfarmer 
+    WMS GetProjectSettings: better drawing order detection
 
-	* python/plugins/fTools/tools/doSubsetSelect.py: Removes limitation
-	on maximum no of selectable features. Fixes #2503. Patch thanks to
-	alexbruy.  git-svn-id: http://svn.osgeo.org/qgis/trunk@13020
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-11-01
 
-2010-03-08  cfarmer 
+    Fix crash if calling GetProjectSettings the first time
 
-	* python/plugins/fTools/tools/doPointDistance.py: Updates distance
-	matrix tool to allow non ascii characters in id fields. This is
-	based on a workaround (from
-	http://docs.python.org/library/csv.html), as the default Python csv
-	function(s) do not support nonascii characters. Fixes #2496 git-svn-id: http://svn.osgeo.org/qgis/trunk@13019
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 98e8ba4 66368f9
+Giuseppe Sucameli 	2012-10-31
 
-2010-03-08  jef 
+    Merge pull request #311 from slarosa/master
+    
+    python console: add splitter and scrollbars, fix for DEL and Backspace key
 
-	* src/app/qgsnewvectorlayerdialog.cpp: fix #2523 git-svn-id: http://svn.osgeo.org/qgis/trunk@13018
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-31
 
-2010-03-07  jef 
+    indentation update
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/ui/qgspgsourceselectbase.ui: fix #2526 git-svn-id: http://svn.osgeo.org/qgis/trunk@13017
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-31
 
-2010-03-07  jef 
+    vertical scrollbar as needed both input and output area
 
-	* src/app/qgsidentifyresults.cpp: fix #2516 git-svn-id: http://svn.osgeo.org/qgis/trunk@13016
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-31
 
-2010-03-07  borysiasty 
+    extent b47b43997
 
-	* i18n/qgis_pl_PL.ts: translation update: pl from QMilena git-svn-id: http://svn.osgeo.org/qgis/trunk@13015
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-31
 
-2010-03-07  jef 
+    Add initial support for editing TopoGeometry objects
+    
+    This is pretty hackish in that it basically creates a new TopoGeometry
+    on every edit, leaving loads of orphaned ones around.
 
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: fix #2511 git-svn-id: http://svn.osgeo.org/qgis/trunk@13014
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-31
 
-2010-03-07  jef 
+    fix for DELETE and BACKSPACE key
+    (it is only an appearance issue)
 
-	* src/python/qgspythonutilsimpl.cpp: fix #2512 git-svn-id: http://svn.osgeo.org/qgis/trunk@13013
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-31
 
-2010-03-06  mhugent 
+    Drop mIsGeography member from QgsPostgresProvider
+    
+    ... now replaced by mSpatialColType
 
-	* src/analysis/vector/qgszonalstatistics.cpp,
-	src/analysis/vector/qgszonalstatistics.h: Added a slightly faster
-	zonal statistics method (but still not as fast as it could be) git-svn-id: http://svn.osgeo.org/qgis/trunk@13012
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-31
 
-2010-03-06  macho 
+    Add mSpatialColType member in QgsPostgresProvider
+    
+    This member tells us if a spatial column is of type Geometry,
+    Geography or TopoGeometry. The member is currently unused but
+    will eventually be used for specially handling TopoGeometry.
+    It could replace the mIsGeography bool, but replacement isn't
+    done by this commit.
+    
+    Incidentally, this commit also adds SRID and type detection
+    for TopoGeometry columns
 
-	* src/ui/qgsabout.ui: just optical changes in the aboutbox
-	(bug?fixes) git-svn-id: http://svn.osgeo.org/qgis/trunk@13011
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-31
 
-2010-03-05  jef 
+    fixed warning
 
-	* src/ui/qgsattributeactiondialogbase.ui: fix combobox order for
-	attribute actions git-svn-id: http://svn.osgeo.org/qgis/trunk@13010
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-31
 
-2010-03-05  jef 
+    feature counts in rulebased widget
 
-	* src/gui/qgsattributeeditor.h: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@13009
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-31
 
-2010-03-05  jef 
+    add vertical scroll bar for input area in console
 
-	* CMakeLists.txt: another fix for Qt with CMake 2.6 git-svn-id: http://svn.osgeo.org/qgis/trunk@13008
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-31
 
-2010-03-05  macho 
+    Fix output/python/qgis dir for Win32 builds that add dir/CMAKE_CFG_INTDIR
 
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@13007
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-31
 
-2010-03-05  jef 
+    Add resize splitter for console
+    as it was from f15b4e1
 
-	* CMakeLists.txt: fix Qt test for CMake 2.6 git-svn-id: http://svn.osgeo.org/qgis/trunk@13006
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-31
 
-2010-03-05  mhugent 
+    Update for d7a7a46, make sure targets are always built for install
 
-	* python/core/qgspoint.sip, src/core/qgspoint.h: Update sip file for
-	qgspoint git-svn-id: http://svn.osgeo.org/qgis/trunk@13005
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-30
 
-2010-03-05  mhugent 
+    Add CMake option WITH_STAGED_PLUGINS (ON by default)
+    
+    - Core plugins remain available once staged (no need to re-build targets, unless source updated or build directory cleared)
+    - Once plugins are staged, setting WITH_STAGED_PLUGINS to OFF allows for much quicker subsequent builds
+    - PyQGIS utilities, console and installer are always staged, regardless of WITH_STAGED_PLUGINS
 
-	* src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/core/qgspoint.cpp, src/core/qgspoint.h: Move
-	distanceSquaredPointToSegment(...) from QgsGeometry to QgsPoint git-svn-id: http://svn.osgeo.org/qgis/trunk@13004
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-30
 
-2010-03-05  rblazek 
+    Revert part of a27aad0, not compatible with generated makefiles for GCC 4.2.1
 
-	* src/plugins/grass/qgis.g.browser.cpp: prepend / to path on win git-svn-id: http://svn.osgeo.org/qgis/trunk@13003
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f68b688 47da0c0
+Giuseppe Sucameli 	2012-10-30
 
-2010-03-05  rblazek 
+    Merge pull request #310 from slarosa/master
+    
+    Add default font-family and size to output area - PyQGIS Console
 
-	* src/plugins/grass/qgsgrasstools.cpp: set GRASS_HTML_BROWSER to
-	qgis.g.browser on win git-svn-id: http://svn.osgeo.org/qgis/trunk@13002
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-30
 
-2010-03-05  rblazek 
+    add default font-family and size to output area in console
+    fix for help dialog
 
-	* src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h: 
-	+putEnv git-svn-id: http://svn.osgeo.org/qgis/trunk@13001
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 234709d 10178d7
+Giuseppe Sucameli 	2012-10-30
 
-2010-03-05  rblazek 
+    Merge pull request #308 from slarosa/master
+    
+    Add UI file for help - PyQGIS Console
 
-	* src/providers/grass/qgsgrass.cpp: use forward slashes in GISBASE
-	on win git-svn-id: http://svn.osgeo.org/qgis/trunk@13000
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e3cd56f 234709d
+Salvatore Larosa 	2012-10-30
 
-2010-03-04  rblazek 
+    Merge branch master of https://github.com/qgis/Quantum-GIS
 
-	* src/plugins/grass/qgsgrassshell.cpp: set color scheme to black /
-	yellow git-svn-id: http://svn.osgeo.org/qgis/trunk@12999
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-30
 
-2010-03-04  kyngchaos 
+    removed importing of traceback module as it is unused
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: attr editor to gui
-	(r12997) git-svn-id: http://svn.osgeo.org/qgis/trunk@12998
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-30
 
-2010-03-04  mhugent 
+    changed nokia to digia as they are the new owner of qt
 
-	* src/app/CMakeLists.txt, src/app/qgsattributeeditor.cpp,
-	src/app/qgsattributeeditor.h, src/gui/CMakeLists.txt,
-	src/gui/qgsattributeeditor.cpp, src/gui/qgsattributeeditor.h: move
-	attribute editor class from app to gui git-svn-id: http://svn.osgeo.org/qgis/trunk@12997
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-29
 
-2010-03-03  rblazek 
+    osgeo4w: switch to GRASS 6.4.3RC1
 
-	* src/plugins/grass/modules-common/v.surf.idw.qgm,
-	src/plugins/grass/modules-common/v.surf.rst.qgm: patches #2438 by
-	lutra git-svn-id: http://svn.osgeo.org/qgis/trunk@12996
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-29
 
-2010-03-03  rblazek 
+    Added python test for QgsFeature from Germán Carrillo
 
-	* src/plugins/grass/qgsgrassshell.cpp: do not run Init.sh in
-	terminal, GRASS is already started if QGIS is run from GRASS shell
-	or everything is set by QgsGrass::openMapset git-svn-id: http://svn.osgeo.org/qgis/trunk@12995
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e5437c4 d6e3188
+Victor Olaya 	2012-10-29
 
-2010-03-03  macho 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran - with many
-	thanks for his presentation of QGIS at 4th Croatian Cadastrial
-	Congress git-svn-id: http://svn.osgeo.org/qgis/trunk@12994
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-10-29
 
-2010-03-03  mhugent 
+    Fixed bug using multipleinputpanel in modeler
 
-	* src/plugins/wfs/qgswfssourceselect.cpp,
-	src/plugins/wfs/qgswfssourceselectbase.ui: BBOX option for wfs git-svn-id: http://svn.osgeo.org/qgis/trunk@12993
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-29
 
-2010-03-02  wonder 
+    Added Dave DeHaan (SQLAnywhere author and maintainer) to the authors file
 
-	* python/core/qgsgeometry.sip: PyQGIS: Fixed splitGeometry() method git-svn-id: http://svn.osgeo.org/qgis/trunk@12992
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-29
 
-2010-03-02  wonder 
+    Fix for failure in unit test thanks to Massimo.
 
-	* CMakeLists.txt: Make sure the user has Qt 4.4 or better, check
-	whether all necessary Qt modules are present.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12991
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-29
 
-2010-03-01  macho 
+    remove unused import
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_es.ts, i18n/qgis_fr.ts, i18n/qgis_he.ts,
-	i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation update: string update for March 2010 git-svn-id: http://svn.osgeo.org/qgis/trunk@12990
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-21
 
-2010-03-01  jef 
+    use plain delimiter if one delimiter only was selected (partially fix #4091)
 
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12989
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-29
 
-2010-03-01  macho 
+    WMS: add keyword attribute for sia feature info output
 
-	* i18n/qgis_el_GR.ts: translation update: greek by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@12988
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-29
 
-2010-03-01  jef 
+    remove about dialog from SEXTANTE plugin
 
-	* src/app/qgsidentifyresults.cpp, src/app/qgsidentifyresults.h: fix
-	crash git-svn-id: http://svn.osgeo.org/qgis/trunk@12987
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-29
 
-2010-03-01  macho 
+    show english help for console if translations not found
 
-	* i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_fr.ts, i18n/qgis_hr_HR.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_pl_PL.ts,
-	i18n/qgis_uk.ts: translation update: monthly string update and new
-	.jp file git-svn-id: http://svn.osgeo.org/qgis/trunk@12986
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-29
 
-2010-02-27  timlinux 
+    fixed accidentally swapped transparency group boxes
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h: UI Tidy ups git-svn-id: http://svn.osgeo.org/qgis/trunk@12981
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-29
 
-2010-02-27  timlinux 
+    Add UI file for help
+    minor fix in settings dialog
 
-	* : New splash for tethys (1.5) git-svn-id: http://svn.osgeo.org/qgis/trunk@12980
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-26
 
-2010-02-27  timlinux 
+    Run Mac bundled app from build directory
+    
+    - No longer a need for hard link
+    - Build directory app bundle, providers, Python plugins and unit tests functional
+    - Adjusted resources corrected on install
 
-	* src/app/gps/qgsgpsinformationwidget.cpp: Prevent crash on feature
-	reset in gps tracker git-svn-id: http://svn.osgeo.org/qgis/trunk@12979
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f010205 1bac84c
+Giuseppe Sucameli 	2012-10-28
 
-2010-02-27  macho 
+    Merge pull request #307 from slarosa/master
+    
+    Reimplemented copy action for keybindings in console
 
-	* TRANSLATORS, i18n/qgis_cs_CZ.ts: translation update with new
-	Contributors git-svn-id: http://svn.osgeo.org/qgis/trunk@12978
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-29
 
-2010-02-26  macho 
+    Reimplemented copy action for keybindings in console
 
-	* i18n/qgis_is.ts, i18n/qgis_uk.ts: translation update: string
-	update will be on 1 of every month from now on git-svn-id: http://svn.osgeo.org/qgis/trunk@12977
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9744b8a 0660dcf
+Tim Sutton 	2012-10-28
 
-2010-02-26  jef 
+    Merge pull request #306 from slarosa/master
+    
+    Remove the about tab in settings dialog for console
 
-	* src/app/qgsidentifyresults.cpp: fix #2479 git-svn-id: http://svn.osgeo.org/qgis/trunk@12976
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-28
 
-2010-02-25  kyngchaos 
+    Remove the about tab in settings dialog for console
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: fix analysis lib link
-	error git-svn-id: http://svn.osgeo.org/qgis/trunk@12975
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-28
 
-2010-02-25  cfarmer 
+    Marked symbologyv2 test as expected to fail
 
-	* python/plugins/fTools/tools/doDefineProj.py: clean output proj
-	file name, fixes: #2466 git-svn-id: http://svn.osgeo.org/qgis/trunk@12974
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-28
 
-2010-02-24  jef 
+    Updated developer panel in about box
 
-	* src/core/qgshttptransaction.cpp: also use WMS credentials when
-	redirected git-svn-id: http://svn.osgeo.org/qgis/trunk@12971
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-28
 
-2010-02-24  jef 
+    Fix transparency issue for splash
 
-	* python/plugins/fTools/tools/doReProject.py: fix crash when trying
-	to reproject empty layers git-svn-id: http://svn.osgeo.org/qgis/trunk@12970
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 46655cf 50f3352
+Giuseppe Sucameli 	2012-10-28
 
-2010-02-24  mhugent 
+    Merge pull request #305 from slarosa/master
+    
+    python console: fix AttributeError, method PythonEdit.createStandardContextMenu doesn't exists
 
-	* : Added epsg 900913 git-svn-id: http://svn.osgeo.org/qgis/trunk@12969
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-28
 
-2010-02-24  macho 
+    Updated splash with essen hackfest image
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@12968
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-28
 
-2010-02-23  kyngchaos 
+    Improvement to contextual menu
+    - typo in help.htm
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: georef resampling
-	(r12965) git-svn-id: http://svn.osgeo.org/qgis/trunk@12967
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 8f6ae95 fe08fd6
+Victor Olaya 	2012-10-28
 
-2010-02-23  mmassing 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Georeferencer:
-	Fix a bug in GDAL script generation.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12966
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-10-28
 
-2010-02-23  mmassing 
+    changed behaviour of pyculator when no selection exist
 
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.h,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsimagewarper.h,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui,
-	src/plugins/georeferencer/qgsvalidateddoublespinbox.h: 
-	Georeferencer: Implement resampling with user-specified target
-	resolution (enhancement request #2447).  git-svn-id: http://svn.osgeo.org/qgis/trunk@12965
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-28
 
-2010-02-23  mmassing 
+    osgeo4w: fix program entry removal
 
-	* src/plugins/georeferencer/qgstransformsettingsdialog.cpp: 
-	Georeferencer: support custom projection strings. Fixes #2464.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12964
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-28
 
-2010-02-22  mhugent 
+    Fix for jenkins breakages caused by addition of licens info to xslt
 
-	* src/core/composer/qgscomposermap.cpp: Fix for missing left line in
-	composer grid (happend with negative left boundary coords). Fixes
-	ticket #2458 git-svn-id: http://svn.osgeo.org/qgis/trunk@12963
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9587252 a8934a2
+Victor Olaya 	2012-10-27
 
-2010-02-22  mhugent 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* src/ui/qgscomposermapwidgetbase.ui: Equal maximum values for grid
-	interval x and y. Fixes ticket #2459 git-svn-id: http://svn.osgeo.org/qgis/trunk@12962
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-10-27
 
-2010-02-22  wonder 
+    partially fixed #6571
+    added splitRGBbands algorithm
 
-	* CONTRIBUTORS, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h: Applied patch from #2461: add support for
-	incremental rendering with symbology-ng.  Fixes $2409.  Contributed
-	by Jeremy Palmer, thanks! git-svn-id: http://svn.osgeo.org/qgis/trunk@12961
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-27
 
-2010-02-21  macho 
+    invert raster colors better
 
-	* i18n/qgis_el_GR.ts: translation update: GR by Mike git-svn-id: http://svn.osgeo.org/qgis/trunk@12960
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 34f677a 9fb1c11
+Larry Shaffer 	2012-10-27
 
-2010-02-19  borysiasty 
+    Merge pull request #303 from slarosa/master
+    
+    [FEATURE] - Split-pane entry and output for PyQGIS console
 
-	* i18n/qgis_pl_PL.ts: translation update: pl from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12957
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 5c762ef 779e166
+Victor Olaya 	2012-10-27
 
-2010-02-18  macho 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* i18n/qgis_el_GR.ts: translation update: greek by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@12956
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-10-27
 
-2010-02-18  wonder 
+    applied path for #6574
+    applied patch for multiple grass sessions
+    added points in polygon weighted
 
-	* python/gui/qgsmapcanvas.sip, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapcanvas.h: Added renderStarting() signal to
-	QgsMapCanvas.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12955
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-27
 
-2010-02-18  wonder 
-
-	* src/core/qgsgeometry.cpp: Fixed a crash when capturing polylines.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12954
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-17  mhugent 
-
-	* src/analysis/vector/qgszonalstatistics.cpp,
-	src/analysis/vector/qgszonalstatistics.h: Improve zonal statistics
-	function in analysis lib git-svn-id: http://svn.osgeo.org/qgis/trunk@12953
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-16  cfarmer 
-
-	* python/plugins/fTools/tools/doJoinAttributes.py: quick typo fix to
-	join attribute tool git-svn-id: http://svn.osgeo.org/qgis/trunk@12952
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-16  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: georeferencer
-	refactoring (r12944, r12945) git-svn-id: http://svn.osgeo.org/qgis/trunk@12951
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-16  mhugent 
-
-	* src/ui/qgssymbolv2selectordialogbase.ui: Higher maximum spin
-	values (for use with map units) git-svn-id: http://svn.osgeo.org/qgis/trunk@12950
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-16  wonder 
-
-	* python/core/qgsmaplayer.sip: PyQGIS: small fixes for handling of
-	QML styling.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12949
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-16  pcav 
-
-	* src/plugins/grass/modules-common/r.los.qgm: Typo in a GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@12948
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-15  mmassing 
-
-	* src/plugins/georeferencer/qgsgeorefplugingui.cpp: Fix #2443 -
-	georeferencer switches 'link georeferencer to QGIS' and 'link QGIS
-	to georeferencer' labels.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12947
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-15  jef 
-
-	* src/plugins/georeferencer/CMakeLists.txt: fix moc warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@12946
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-14  mmassing 
-
-	* src/plugins/georeferencer/CMakeLists.txt,
-	src/plugins/georeferencer/add_point.xpm,
-	src/plugins/georeferencer/georeferencer.qrc,
-	src/plugins/georeferencer/icons/qgis.xpm,
-	src/plugins/georeferencer/mapcoordsdialog.cpp,
-	src/plugins/georeferencer/mapcoordsdialog.h,
-	src/plugins/georeferencer/mapcoordsdialogbase.ui,
-	src/plugins/georeferencer/qgsgcpcanvasitem.cpp,
-	src/plugins/georeferencer/qgsgcpcanvasitem.h,
-	src/plugins/georeferencer/qgsgcplist.cpp,
-	src/plugins/georeferencer/qgsgcplist.h,
-	src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistmodel.h,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.h,
-	src/plugins/georeferencer/qgsgcplistwidgetbase.ui,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefconfigdialog.h,
-	src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefdelegates.cpp,
-	src/plugins/georeferencer/qgsgeorefdelegates.h,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialog.h,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugin.cpp,
-	src/plugins/georeferencer/qgsgeorefplugin.h,
-	src/plugins/georeferencer/qgsgeorefplugingui.cpp,
-	src/plugins/georeferencer/qgsgeorefplugingui.h,
-	src/plugins/georeferencer/qgsgeorefpluginguibase.ui,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooladdpoint.h,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftooldeletepoint.h,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp,
-	src/plugins/georeferencer/qgsgeoreftoolmovepoint.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeorefvalidators.cpp,
-	src/plugins/georeferencer/qgsgeorefvalidators.h,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.h,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsimagewarper.h,
-	src/plugins/georeferencer/qgsleastsquares.cpp,
-	src/plugins/georeferencer/qgsleastsquares.h,
-	src/plugins/georeferencer/qgsmapcoordsdialog.cpp,
-	src/plugins/georeferencer/qgsmapcoordsdialog.h,
-	src/plugins/georeferencer/qgsmapcoordsdialogbase.ui,
-	src/plugins/georeferencer/qgsopenrasterdialog.cpp,
-	src/plugins/georeferencer/qgsopenrasterdialog.h,
-	src/plugins/georeferencer/qgsopenrasterdialogbase.ui,
-	src/plugins/georeferencer/qgspointdialog.cpp,
-	src/plugins/georeferencer/qgspointdialog.h,
-	src/plugins/georeferencer/qgspointdialogbase.ui,
-	src/plugins/georeferencer/qgstransformsettingsdialog.cpp,
-	src/plugins/georeferencer/qgstransformsettingsdialog.h,
-	src/plugins/georeferencer/qgstransformsettingsdialogbase.ui,
-	src/plugins/georeferencer/qgstransformtypedialogbase.ui: Update
-	georeferencer from gislab SVN, which adds GCP table with errors, new
-	user interface and raster properties configuration (thanks to Maxim
-	Dubinin and Jack R at gis-lab). Part 2/2 of new georeferencer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12945
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-14  mmassing 
-
-	* src/plugins/georeferencer/CMakeLists.txt,
-	src/plugins/georeferencer/qgsgcplist.h,
-	src/plugins/georeferencer/qgsgcplistmodel.cpp,
-	src/plugins/georeferencer/qgsgcplistmodel.h,
-	src/plugins/georeferencer/qgsgcplistwidget.cpp,
-	src/plugins/georeferencer/qgsgcplistwidget.h,
-	src/plugins/georeferencer/qgsgcplistwidgetbase.ui,
-	src/plugins/georeferencer/qgsgeorefdatapoint.cpp,
-	src/plugins/georeferencer/qgsgeorefdatapoint.h,
-	src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui,
-	src/plugins/georeferencer/qgsgeorefplugin.cpp,
-	src/plugins/georeferencer/qgsgeorefplugin.h,
-	src/plugins/georeferencer/qgsgeoreftransform.cpp,
-	src/plugins/georeferencer/qgsgeoreftransform.h,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp,
-	src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui,
-	src/plugins/georeferencer/qgsimagewarper.cpp,
-	src/plugins/georeferencer/qgsimagewarper.h,
-	src/plugins/georeferencer/qgspointdialog.cpp,
-	src/plugins/georeferencer/qgspointdialog.h,
-	src/plugins/georeferencer/qgspointdialogbase.ui: Merge with
-	WARP_REFACTORING branch, which refactors and adds infrastructure for
-	gcp fitting and residual error reporting. Part 1/2 of new
-	georeferencer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12944
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-13  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: grass fix (r12936) git-svn-id: http://svn.osgeo.org/qgis/trunk@12941
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  macho 
-
-	* i18n/qgis_el_GR.ts: translation update: greek by mike git-svn-id: http://svn.osgeo.org/qgis/trunk@12940
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  wonder 
-
-	* src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h: Fixed
-	#2422 git-svn-id: http://svn.osgeo.org/qgis/trunk@12939
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  rblazek 
-
-	* src/plugins/grass/qgsgrassshell.cpp: set GRASS_HTML_BROWSER for
-	term (does not work, overriden by Init.sh git-svn-id: http://svn.osgeo.org/qgis/trunk@12938
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  rblazek 
-
-	* src/plugins/grass/qgsgrassmapcalc.h,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h: handle better mumltiple empty
-	output git-svn-id: http://svn.osgeo.org/qgis/trunk@12937
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  rblazek 
-
-	* src/plugins/grass/modules-common/v.kernel.qgm,
-	src/plugins/grass/scripts/qgis.v.kernel.rast.py: output opt fix git-svn-id: http://svn.osgeo.org/qgis/trunk@12936
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  wonder 
-
-	* python/gui/qgsmapcanvas.sip, src/gui/qgsmapcanvas.cpp,
-	src/gui/qgsmapcanvas.h: Added QgsMapCanvas::layers() method git-svn-id: http://svn.osgeo.org/qgis/trunk@12935
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-02-12  jef 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp: fix #2435 git-svn-id: http://svn.osgeo.org/qgis/trunk@12933
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Follow up f15b4e1
+    - add contextual menu to output area (copy and enter selected entry)
+    - auto-entered for entry in import class menu
+    - cleaning code
+    - more info see http://hub.qgis.org/issues/6558
 
-2010-02-12  jef 
+Merge: f15b4e1 6870cff
+Salvatore Larosa 	2012-10-26
 
-	* src/providers/grass/qgis.g.info.c: fix build error git-svn-id: http://svn.osgeo.org/qgis/trunk@12932
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #2 from dakcarto/console-nosplitter_1
+    
+    No splitter, mellower colors
 
-2010-02-12  kyngchaos 
+Larry Shaffer 	2012-10-26
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: Brazilian context help
-	(r12929) git-svn-id: http://svn.osgeo.org/qgis/trunk@12931
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    No splitter, mellower colors
 
-2010-02-11  jef 
+Radim Blazek 	2012-10-26
 
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12930
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    make attribute table and identify consistent with map canvas
 
-2010-02-11  jef 
+Marco Hugentobler 	2012-10-26
 
-	* resources/context_help/QgsAttributeTable-pt_BR,
-	resources/context_help/QgsAttributeTableDialog-pt_BR,
-	resources/context_help/QgsCreateNewVectorLayer-pt_BR,
-	resources/context_help/QgsDbSourceSelect-pt_BR,
-	resources/context_help/QgsGPSPlugin-pt_BR,
-	resources/context_help/QgsGPSPluginGui-pt_BR,
-	resources/context_help/QgsMeasure-pt_BR,
-	resources/context_help/QgsMeasureDialog-pt_BR,
-	resources/context_help/QgsNewVectorLayerDialog-pt_BR,
-	resources/context_help/QgsPgSourceSelect-pt_BR,
-	resources/context_help/QgsServerSourceSelect-pt_BR,
-	resources/context_help/QgsWMSSourceSelect-pt_BR: fix brasilian
-	context help git-svn-id: http://svn.osgeo.org/qgis/trunk@12929
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix case where several WMS layers have the same feature info alias
 
-2010-02-11  mhugent 
+D'Hont René-Luc 	2012-10-26
 
-	* python/core/qgscomposershape.sip: Add transfer this to second
-	composer shape constructor git-svn-id: http://svn.osgeo.org/qgis/trunk@12928
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add mapserver qgsspatialfilter
 
-2010-02-11  jef 
+D'Hont René-Luc 	2012-10-26
 
-	* src/app/ogr/qgsogrhelperfunctions.cpp: fix #2026 git-svn-id: http://svn.osgeo.org/qgis/trunk@12927
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    #6535 Support WFS Post GetFeature Request in QGIS-Server
 
-2010-02-11  jef 
+Salvatore Larosa 	2012-10-26
 
-	* src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h: use signals to mark project dirty when canvas
-	layer or extents change (fixes #943) git-svn-id: http://svn.osgeo.org/qgis/trunk@12926
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] - Split-pane entry and output for PyQGIS console
 
-2010-02-11  rblazek 
+Larry Shaffer 	2012-10-25
 
-	* src/plugins/grass/qgsgrassedittools.cpp: fixed crash on edit attr
-	/ no line git-svn-id: http://svn.osgeo.org/qgis/trunk@12925
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add cmake option WITH_PY_COMPILE (OFF by default)
+    
+    - Byte-compiles staged and intalled plugins/modules
 
-2010-02-11  rblazek 
+Marco Hugentobler 	2012-10-26
 
-	* src/providers/grass/qgis.g.info.c: handle better null values git-svn-id: http://svn.osgeo.org/qgis/trunk@12924
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add osg include dir for globe compilation
 
-2010-02-11  jef 
+Marco Hugentobler 	2012-10-26
 
-	* src/plugins/grass/qgis.g.browser.cpp,
-	src/providers/grass/qgsgrass.h: fix windows build errors git-svn-id: http://svn.osgeo.org/qgis/trunk@12923
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement bag of properties for SIA2045 feature info output
 
-2010-02-10  jef 
+Marco Hugentobler 	2012-10-25
 
-	* src/app/ogr/qgsogrhelperfunctions.cpp: fix #2009 git-svn-id: http://svn.osgeo.org/qgis/trunk@12922
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Move sia2045 xml conversion from request handler to wms server class
 
-2010-02-10  borysiasty 
+Marco Hugentobler 	2012-10-25
 
-	* images/images.qrc: gis theme icons for mActionMeasureAngle and
-	Mapserver Export Plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@12921
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Remove empty wms keyword list from project properties
 
-2010-02-10  wonder 
+Marco Hugentobler 	2012-10-25
 
-	* python/console.py: Python console: basic syntax highlighting
-	(prompt, errors) git-svn-id: http://svn.osgeo.org/qgis/trunk@12920
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Support elements KeywordList, Fees, AccesConstraints in QGIS server capabilities
 
-2010-02-10  rblazek 
+Larry Shaffer 	2012-10-25
 
-	* src/plugins/grass/qgsgrassshell.cpp,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h: 
-	reset GRASS_GUI in term git-svn-id: http://svn.osgeo.org/qgis/trunk@12919
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Redo of 3ce27d6, hard-link to Mac embedded app bundle binary
 
-2010-02-10  kyngchaos 
+Merge: 558245c f391d99
+Magnus Homann 	2012-10-25
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: grass g.browser (r12915) git-svn-id: http://svn.osgeo.org/qgis/trunk@12918
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #301 from homann/trans_sv
+    
+    Trans sv
 
-2010-02-10  rblazek 
+Magnus Homann 	2012-10-25
 
-	* src/plugins/grass/modules-common/g.proj.proj.qgm: the file is
-	input git-svn-id: http://svn.osgeo.org/qgis/trunk@12917
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added lots of translations from Victor Axbom, through Qt phrase book. Thanks!
 
-2010-02-10  rblazek 
+Magnus Homann 	2012-10-13
 
-	* src/plugins/grass/qgsgrassmapcalc.cpp: printed command ready for
-	copy-paste git-svn-id: http://svn.osgeo.org/qgis/trunk@12916
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    4119 översättningar
 
-2010-02-10  rblazek 
+Radim Blazek 	2012-10-25
 
-	* src/plugins/grass/CMakeLists.txt,
-	src/plugins/grass/qgis.g.browser.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp: default browser starter git-svn-id: http://svn.osgeo.org/qgis/trunk@12915
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    count features in legend for rule based renderer, fixes #5768
 
-2010-02-10  rblazek 
+Alexander Bruy 	2012-10-25
 
-	* src/plugins/grass/qgsgrassmodule.cpp: do not use empty input git-svn-id: http://svn.osgeo.org/qgis/trunk@12914
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix SEXTANTE things broken by 6ca7ea987d
 
-2010-02-10  pcav 
+Alexander Bruy 	2012-10-25
 
-	* src/plugins/grass/modules-common/v.dissolve.qgm: Fix in v.dissolve
-	GRASS module - closes #2351. Thanks Giovanni Manghi git-svn-id: http://svn.osgeo.org/qgis/trunk@12912
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    missed metadata.txt for fTools
 
-2010-02-09  rblazek 
+Alexander Bruy 	2012-10-25
 
-	* src/plugins/grass/qgsgrassmodule.cpp: open external links from man git-svn-id: http://svn.osgeo.org/qgis/trunk@12911
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    temporarily switch back to using subprocess module (addresses #6543)
 
-2010-02-09  mhugent 
+Alexander Bruy 	2012-10-25
 
-	* python/gui/qgscomposerview.sip: add shape methods to composerview
-	sip git-svn-id: http://svn.osgeo.org/qgis/trunk@12910
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    use lowercase letters for menu (fix #5436)
 
-2010-02-09  wonder 
+Alexander Bruy 	2012-10-25
 
-	* python/core/qgspluginlayer.sip, src/core/qgspluginlayer.cpp,
-	src/core/qgspluginlayer.h: Applied patch from #2424 by Mathias
-	Walker.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12909
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add metadata.txt to all core plugins
 
-2010-02-09  mhugent 
+Marco Hugentobler 	2012-10-25
 
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp: Encode and decode
-	alpha color component git-svn-id: http://svn.osgeo.org/qgis/trunk@12908
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix typo
 
-2010-02-09  mhugent 
+Alexander Bruy 	2012-10-25
 
-	* python/core/qgscomposershape.sip: Fix for previous fix git-svn-id: http://svn.osgeo.org/qgis/trunk@12907
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add category metadata to SEXTANTE plugin
 
-2010-02-09  rblazek 
+Sandro Santilli 	2012-10-25
 
-	* src/providers/grass/qgis.d.rast.c: another attempt to set stdout
-	binary mode on win git-svn-id: http://svn.osgeo.org/qgis/trunk@12906
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running sextante plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-09  mhugent 
+Sandro Santilli 	2012-10-25
 
-	* python/core/core.sip: Add composer shape item to sip list git-svn-id: http://svn.osgeo.org/qgis/trunk@12905
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Rename script files to avoid spaces in filenames
+    
+    This makes life easier with PLUGIN_INSTALL.
+    I did try to make PLUGIN_INSTALL better but couldn't find a way
+    to have both "(" and " " quoted at once...
 
-2010-02-09  mhugent 
+Sandro Santilli 	2012-10-25
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix for small raster shift
-	introduced by my raster memory handling improvements git-svn-id: http://svn.osgeo.org/qgis/trunk@12904
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    PLUGIN_INSTALL: quote filenames
+    
+    Fixes use with filenames having shell-dangerous chars like "(".
+    NOTE: sextante help files have frequent such occurrences
 
-2010-02-08  jef 
+Larry Shaffer 	2012-10-25
 
-	* src/core/qgsvectorfilewriter.cpp: include projection error in
-	vector file writer error message git-svn-id: http://svn.osgeo.org/qgis/trunk@12903
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Hard-link to Mac embedded app bundle binary
+    
+    - Allows QGIS to be run directly from build directory
+    - Link made at /output/bin/QGIS
 
-2010-02-08  jef 
+Larry Shaffer 	2012-10-25
 
-	* src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c: remove glocale and package names
-	again git-svn-id: http://svn.osgeo.org/qgis/trunk@12902
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Update to e31fb3c
+    
+    - Add comments about issue
+    - Set pkgDataPath to empty QString for fix
 
-2010-02-08  wonder 
+Marco Hugentobler 	2012-10-25
 
-	* src/core/qgsmaprenderer.h, src/core/qgsvectorlayer.cpp,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h: Uhm... fixing compilation error,
-	take #2.  Hopefully also with better label size scaling in composer
-	(labeling plugin) git-svn-id: http://svn.osgeo.org/qgis/trunk@12900
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Possibility to set url for a feature info schema
 
-2010-02-08  wonder 
+Larry Shaffer 	2012-10-25
 
-	* python/core/qgsmaprenderer.sip: Fixed compilation of python
-	bindings due my recent changes.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12899
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Additional fix for # 5879, handle .ui files for python utilities
+    
+    - Built off of pull request 299 by Salvatore Larosa
 
-2010-02-07  jef 
+Larry Shaffer 	2012-10-25
 
-	* debian/control, debian/rules,
-	src/providers/spatialite/qgsspatialiteprovider.cpp: fix #2410 git-svn-id: http://svn.osgeo.org/qgis/trunk@12898
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Additional fix for # 5879
+    
+    - Adjust QgsApplication::pkgDataPath temporarily for restoring core plugins when running from build directory
 
-2010-02-07  wonder 
+Larry Shaffer 	2012-10-25
 
-	* src/core/composer/qgscomposermap.cpp,
-	src/core/qgsmaprenderer.cpp, src/core/qgsmaprenderer.h,
-	src/plugins/labeling/labeling.cpp,
-	src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h: Show labels from labeling plugin
-	also in map composer (though not scaled correctly) git-svn-id: http://svn.osgeo.org/qgis/trunk@12897
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Adv labeling, turn off excessive debug output
 
-2010-02-07  rblazek 
+Radim Blazek 	2012-10-24
 
-	* src/providers/grass/qgis.d.rast.c: force binary mode for stdout git-svn-id: http://svn.osgeo.org/qgis/trunk@12896
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    invert color fix
 
-2010-02-07  cfarmer 
+Radim Blazek 	2012-10-24
 
-	* python/plugins/fTools/tools/frmRegPoints.ui,
-	python/plugins/fTools/tools/frmVectorGrid.ui: update maximum grid
-	spacing for regular points tool (fixes #2404).  git-svn-id: http://svn.osgeo.org/qgis/trunk@12893
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    warnings fix
 
-2010-02-07  cfarmer 
+Merge: e210a57 e837a96
+Werner Macho 	2012-10-24
 
-	* python/plugins/fTools/tools/doJoinAttributes.py: check for both
-	lower- and upper-case extensions (fixes #2414), and clear field
-	names upon update (fixes#2386).  git-svn-id: http://svn.osgeo.org/qgis/trunk@12892
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #300 from gioman/master
+    
+    New PT_PT translations, courtesy of Nelson Silva
 
-2010-02-06  jef 
+Vânia Neves 	2012-10-24
 
-	* src/app/qgsprojectproperties.cpp: fix #2408 git-svn-id: http://svn.osgeo.org/qgis/trunk@12891
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    New PT_PT translations, courtesy of Nelson Silva
 
-2010-02-06  jef 
+Radim Blazek 	2012-10-24
 
-	* python/core/qgsvectorfilewriter.sip,
-	src/app/legend/qgslegendlayer.cpp,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h: 
-	improve vector file writers error reporting git-svn-id: http://svn.osgeo.org/qgis/trunk@12890
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsError for better error propagation to user, started using for rasters
 
-2010-02-06  kyngchaos 
+Werner Macho 	2012-10-24
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: grass raster provider
-	(r12880) git-svn-id: http://svn.osgeo.org/qgis/trunk@12889
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    added machine readable license
 
-2010-02-05  rblazek 
+Larry Shaffer 	2012-10-23
 
-	* src/providers/grass/qgis.g.info.c: get null outside map git-svn-id: http://svn.osgeo.org/qgis/trunk@12888
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Revert "Do not setPkgDataPath to source dir when running from build dir"
+    
+    This reverts commit 227401d434d2a611715873bc1107d938b76740bd.
+    
+    Otherwise, crssync fails when setting up db for running tests
 
-2010-02-05  cfarmer 
+Larry Shaffer 	2012-10-23
 
-	* python/plugins/fTools/tools/doRegPoints.py: Fix bug with outdated
-	name of QgsRectangle class (QgsRect) git-svn-id: http://svn.osgeo.org/qgis/trunk@12887
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix PLUGIN_INSTALL build error
 
-2010-02-05  rblazek 
+Sandro Santilli 	2012-10-23
 
-	* src/providers/grass/CMakeLists.txt: added GDAL_LIBRARY for GRASS
-	modules because GRASS libs can use GDAL git-svn-id: http://svn.osgeo.org/qgis/trunk@12886
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running osm plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-05  rblazek 
+Sandro Santilli 	2012-10-23
 
-	* src/plugins/grass/qgsgrassbrowser.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp: use GRASS raster provider
-	everywhere git-svn-id: http://svn.osgeo.org/qgis/trunk@12885
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running mapserver_export plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-04  rblazek 
+Sandro Santilli 	2012-10-23
 
-	* src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c: removed translation, causing
-	compilation problems git-svn-id: http://svn.osgeo.org/qgis/trunk@12883
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running GdalTools plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-04  jef 
+Sandro Santilli 	2012-10-22
 
-	* src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c: fix some warnings & build errors
-	(Linux/Windows) git-svn-id: http://svn.osgeo.org/qgis/trunk@12882
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running fTools plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-04  jef 
+Sandro Santilli 	2012-10-23
 
-	* debian/changelog, debian/compat, debian/compat.hardy,
-	debian/compat.intrepid, debian/compat.jaunty, debian/compat.karmic,
-	debian/compat.lenny, debian/compat.sid, debian/control.sid,
-	debian/copyright, debian/python-qgis.install.in,
-	debian/qgis-plugin-grass-common.install,
-	debian/qgis-plugin-grass.install.in,
-	debian/qgis-plugin-grass.preinst, debian/qgis.sh,
-	debian/qgis.sh.in, debian/rules,
-	src/plugins/grass/qtermwidget/kpty.cpp: debian packaging update git-svn-id: http://svn.osgeo.org/qgis/trunk@12881
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Do not setPkgDataPath to source dir when running from build dir
+    
+    We want to use the output/ dir for that !
+    Fixes load of fTools from build tree (coming next)
 
-2010-02-04  rblazek 
+Larry Shaffer 	2012-10-22
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/providers/grass/CMakeLists.txt,
-	src/providers/grass/qgis.d.rast.c,
-	src/providers/grass/qgis.g.info.c,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h,
-	src/providers/grass/qgsgrassrasterprovider.cpp,
-	src/providers/grass/qgsgrassrasterprovider.h: GRASS raster data
-	provider git-svn-id: http://svn.osgeo.org/qgis/trunk@12880
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Adv labeling, add multi-line spacing and alignment
 
-2010-02-04  rblazek 
+Larry Shaffer 	2012-10-23
 
-	* src/core/qgsrasterdataprovider.cpp,
-	src/core/qgsrasterdataprovider.h,
-	src/core/raster/qgsrasterlayer.cpp: prepare for GRASS raster
-	provider git-svn-id: http://svn.osgeo.org/qgis/trunk@12879
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Updates to Mac install notes
+    
+    - Add section on debug output and running tests
 
-2010-02-04  wonder 
+Larry Shaffer 	2012-10-17
 
-	* python/core/qgsfeature.sip,
-	python/core/qgsvectordataprovider.sip,
-	python/core/qgsvectorlayer.sip: PyQGIS: few additions for more
-	pythonic api - QgsVectorLayer and QgsVectorDataProvider support iterating - QgsFeature allows direct access to attributes (get/set/del) git-svn-id: http://svn.osgeo.org/qgis/trunk@12878
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add CMake finds for QScintilla2 and Qsci module
+    
+    - Needs testing on Windows platform
+    - Add QScintilla2 library version info to About dialog
+    - Add Mac bundling support for Qwt 6 framework and QScintilla2
+    - Fallback to sys or custom site-pkgs when looking for PyQt4 modules to Mac bundle
 
-2010-02-04  mhugent 
+Larry Shaffer 	2012-10-22
 
-	* src/core/composer/qgscomposermap.cpp: Fix composer map annotation
-	bug git-svn-id: http://svn.osgeo.org/qgis/trunk@12877
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix #6505, set typedef for Mac size_t in bindings
 
-2010-02-04  macho 
+Merge: a45b759 a29ccbf5
+Giuseppe Sucameli 	2012-10-22
 
-	* i18n/qgis_hr_HR.ts: translation update: hr by zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12876
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #298 from slarosa/master
+    
+    Enable non-ascii chars in Python Console
 
-2010-02-04  wonder 
+Salvatore Larosa 	2012-10-22
 
-	* python/core/qgsfeature.sip: wrapped new method from r12869 git-svn-id: http://svn.osgeo.org/qgis/trunk@12873
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Enable non-ascii chars in Python Console
+    fixes issue http://hub.qgis.org/issues/6548
 
-2010-02-04  mhugent 
+Alexander Bruy 	2012-10-20
 
-	* src/app/qgisapp.cpp: Emit composer add/remove signals also if
-	composers are added from project file git-svn-id: http://svn.osgeo.org/qgis/trunk@12872
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] TauDEM provider for SEXTANTE
 
-2010-02-04  jef 
+Merge: dbab4a2 feec5f0
+Marco Hugentobler 	2012-10-22
 
-	* src/app/attributetable/qgsattributetablemodel.cpp: fix r12869: if
-	first feature has id 0 it wasn't retrieved git-svn-id: http://svn.osgeo.org/qgis/trunk@12871
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch for sia2045 GetFeatureInfo output
 
-2010-02-04  kyngchaos 
+Marco Hugentobler 	2012-10-22
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: postgres credentials
-	(r12859); split analysis sip into 2 parts so unused parts not
-	missing git-svn-id: http://svn.osgeo.org/qgis/trunk@12870
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Possibility to manually enter a project property to have WMS feature info in sia2045 format
 
-2010-02-04  jef 
+Marco Hugentobler 	2012-10-22
 
-	* src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/attributetable/qgsattributetablemodel.h,
-	src/core/qgsfeature.cpp, src/core/qgsfeature.h,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/providers/grass/qgsgrassprovider.cpp,
-	src/providers/ogr/qgsogrprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/spatialite/qgsspatialiteprovider.cpp: fix #2397 by
-	clearing attribute maps when retrieving features git-svn-id: http://svn.osgeo.org/qgis/trunk@12869
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Drop invalid characters from xml element names
 
-2010-02-03  mhugent 
+Juergen E. Fischer 	2012-10-21
 
-	* src/core/gps/qgsnmeaconnection.cpp: also fix year in gps date git-svn-id: http://svn.osgeo.org/qgis/trunk@12868
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update QgsVectorLayer bindings (fixes #6550)
 
-2010-02-03  mhugent 
+Martin Dobias 	2012-10-21
 
-	* src/core/gps/qgsnmeaconnection.cpp: fix for gps date git-svn-id: http://svn.osgeo.org/qgis/trunk@12867
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Enabled delimitedtext provider again
 
-2010-02-03  jef 
+Martin Dobias 	2012-10-20
 
-	* CMakeLists.txt, cmake/FindGSL.cmake: revert CBLAS part of r11250:
-	we actually don't use CBLAS directly, but GSL does w/o being linked
-	to it (see also
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456898) git-svn-id: http://svn.osgeo.org/qgis/trunk@12866
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Skip rendering of features without geometry
 
-2010-02-03  mhugent 
+Martin Dobias 	2012-10-20
 
-	* CMakeLists.txt: Link cblas libraries. Fixes bug 2401 git-svn-id: http://svn.osgeo.org/qgis/trunk@12865
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Store attributes and fields in vectors instead of maps
 
-2010-02-03  mhugent 
+Sandro Santilli 	2012-10-20
 
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h,
-	src/core/gps/qgsnmeaconnection.cpp: Added utc date and time to gps
-	information and insert connection into the registry git-svn-id: http://svn.osgeo.org/qgis/trunk@12862
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow running plugin_installer plugin from build dir
+    
+    See http://hub.qgis.org/issues/5879
 
-2010-02-02  macho 
+Merge: 6546d74 2765220
+Victor Olaya 	2012-10-20
 
-	* i18n/qgis_hr_HR.ts: translation update: HR by zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12860
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-02-01  jef 
+Victor Olaya 	2012-10-20
 
-	* src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgsourceselect.cpp, src/app/qgisapp.cpp,
-	src/app/qgsmanageconnectionsdialog.cpp, src/core/CMakeLists.txt,
-	src/core/qgscredentials.cpp, src/core/qgscredentials.h,
-	src/core/qgsdatasourceuri.cpp, src/core/qgsdatasourceuri.h,
-	src/core/qgspoint.h, src/gui/CMakeLists.txt,
-	src/gui/qgscredentialdialog.cpp, src/gui/qgscredentialdialog.h,
-	src/plugins/spit/CMakeLists.txt,
-	src/providers/postgres/qgspostgresprovider.cpp,
-	src/ui/qgscompositionwidget.h, src/ui/qgscredentialdialog.ui,
-	src/ui/qgspgnewconnectionbase.ui: [FEATURE] allow postgres layers
-	without saved username & password by asking for credentials git-svn-id: http://svn.osgeo.org/qgis/trunk@12859
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Added patch for #6545
+    Fixed bug in SAGA extent calculation (there was a half cellsize offset)
 
-2010-02-01  wonder 
+Giuseppe Sucameli 	2012-10-20
 
-	* python/console.py: Fixed few problems in console: - pressing enter if the cursor was not at the end - ctrl+shift to select words didn't work git-svn-id: http://svn.osgeo.org/qgis/trunk@12858
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix build
 
-2010-02-01  kyngchaos 
+Merge: 8ca2236 3fecd44
+Giuseppe Sucameli 	2012-10-19
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: connections manager
-	(r12855) git-svn-id: http://svn.osgeo.org/qgis/trunk@12857
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #297 from slarosa/master
+    
+    [FEATURE] - Choose Fontfamily and API files for Python Console
 
-2010-02-01  wonder 
+Merge: ca20be1 8ca2236
+Salvatore Larosa 	2012-10-20
 
-	* python/core/qgsrastershader.sip,
-	python/core/qgsrastershaderfunction.sip: PyQGIS: wrapped raster
-	shaders (color ramp, freak out, pseudocolor) git-svn-id: http://svn.osgeo.org/qgis/trunk@12856
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch master of https://github.com/qgis/Quantum-GIS
 
-2010-02-01  mhugent 
+Sandro Santilli 	2012-10-20
 
-	* src/app/CMakeLists.txt, src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h,
-	src/app/qgsmanageconnectionsdialog.cpp,
-	src/app/qgsmanageconnectionsdialog.h,
-	src/app/qgswmssourceselect.cpp, src/app/qgswmssourceselect.h,
-	src/ui/qgsmanageconnectionsdialogbase.ui,
-	src/ui/qgspgsourceselectbase.ui, src/ui/qgswmssourceselectbase.ui: 
-	Applied patch #2341 (loading and saving of WMS and PostGIS
-	connections) from alexbruy git-svn-id: http://svn.osgeo.org/qgis/trunk@12855
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add a PLUGIN_INSTALL cmake macro and use it from db_manager plugin
+    
+    One step forward toward closing http://hub.qgis.org/issues/5879
+    Next all pugins should be converted to use of the macro...
 
-2010-01-31  wonder 
+Marco Hugentobler 	2012-10-20
 
-	* python/CMakeLists.txt: PyQGIS: make sure that python modules don't
-	get out of sync: rebuild gui and analysis modules when core module
-	is changed git-svn-id: http://svn.osgeo.org/qgis/trunk@12854
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add const
 
-2010-01-29  wonder 
+Marco Hugentobler 	2012-10-20
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsrendererv2registry.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.h,
-	src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp: 
-	QgsRendererV2 metadata: for renderer icon use QIcon instead of icon
-	file name.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12852
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Oversampling parameter is now in resample filter
 
-2010-01-29  macho 
+Marco Hugentobler 	2012-10-20
 
-	* i18n/qgis_hr_HR.ts: translation update: HR by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12851
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix image format conversion (used e.g. for WMS client) and two memory leaks
 
-2010-01-29  kyngchaos 
+Salvatore Larosa 	2012-10-14
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: new attr sel dlg buttons
-	(r12843) git-svn-id: http://svn.osgeo.org/qgis/trunk@12850
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] - Choose Fontfamily and API files for Python Console
+    - update Italian translation
+    - added Settings icon for toolbar
+    - update Italian translation fro console_help
 
-2010-01-29  wonder 
+Sandro Santilli 	2012-10-13
 
-	* src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h: PyQGIS: fix to support older
-	SIP versions (4.7.x) git-svn-id: http://svn.osgeo.org/qgis/trunk@12848
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Allow loading plugins from output dir
+    
+    See http://hub.qgis.org/issues/5879
+    
+    Still needs to find plugins under output/ dir for them to be
+    loaded ...
 
-2010-01-29  mhugent 
+Juergen E. Fischer 	2012-10-19
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/ui/qgssymbolv2selectordialogbase.ui: Display alpha value as
-	transparency (to be consistent with the interface in old symbology) git-svn-id: http://svn.osgeo.org/qgis/trunk@12847
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    skip views without pk candidate
 
-2010-01-28  mhugent 
+Radim Blazek 	2012-10-19
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.h: Fix for compilation
-	problem git-svn-id: http://svn.osgeo.org/qgis/trunk@12844
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    apply user no data to identify
 
-2010-01-28  mhugent 
+Radim Blazek 	2012-10-19
 
-	* src/app/CMakeLists.txt,
-	src/app/composer/qgsattributeselectiondialog.cpp,
-	src/app/composer/qgsattributeselectiondialog.h: Added scrool area,
-	'select all' and 'clear' buttons to attribute dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12843
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    identify context only if not projected on server
 
-2010-01-28  mhugent 
+Marco Hugentobler 	2012-10-19
 
-	* src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h,
-	src/ui/qgscomposertablewidgetbase.ui: [FEATURE]: possibility to show
-	only visible features in composer table or all features git-svn-id: http://svn.osgeo.org/qgis/trunk@12840
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Simplify server config parser by using layer information (alias, excluded attributes) directly
 
-2010-01-28  jef 
+Radim Blazek 	2012-10-19
 
-	* debian/rules: debian packaging: depend on python 2.5 for sid while
-	transition to 2.6 is on git-svn-id: http://svn.osgeo.org/qgis/trunk@12839
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    identify expand/collaps tools
 
-2010-01-27  kyngchaos 
+Radim Blazek 	2012-10-19
 
-	* mac/xcode/Info.plist, src/mac/Contents/Info.plist.in: update
-	copyright in info.plist git-svn-id: http://svn.osgeo.org/qgis/trunk@12838
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    identify context only if not projected
 
-2010-01-27  kyngchaos 
+Marco Hugentobler 	2012-10-19
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: custom plugin layers
-	(r12834) git-svn-id: http://svn.osgeo.org/qgis/trunk@12837
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consider attribute aliases and hidden attributes in GetProjectSettings. Don't show WFS layers in GetCapabilities
 
-2010-01-26  borysiasty 
+Marco Hugentobler 	2012-10-19
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@12836
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Simplify code for excluding attributes from WMS server. Works now also with embedded layers
 
-2010-01-26  wonder 
+Pirmin Kalberer 	2012-10-19
 
-	* src/core/qgsmaplayer.h, src/core/qgspluginlayer.h,
-	src/core/qgspluginlayerregistry.h: Added notes that the new stuff
-	was added in v1.5.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12835
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Optional use of external osgEarthQt
 
-2010-01-26  wonder 
+Pirmin Kalberer 	2012-10-16
 
-	* python/core/core.sip, python/core/qgsmaplayer.sip,
-	python/core/qgspluginlayer.sip,
-	python/core/qgspluginlayerregistry.sip,
-	src/app/legend/qgslegendlayer.cpp, src/app/qgisapp.cpp,
-	src/core/CMakeLists.txt, src/core/qgsmaplayer.cpp,
-	src/core/qgsmaplayer.h, src/core/qgspluginlayer.cpp,
-	src/core/qgspluginlayer.h, src/core/qgspluginlayerregistry.cpp,
-	src/core/qgspluginlayerregistry.h, src/core/qgsproject.cpp: 
-	[FEATURE] Support for custom plugin layers. Applied patch from #2392
-	contributed by Mathias Walker. Thanks! Some parts modified to make plugin layers easier to use and more
-	robust.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12834
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Unload globe viewer
 
-2010-01-25  jef 
+Pirmin Kalberer 	2012-10-16
 
-	* src/core/qgsvectorlayer.cpp: workaround for #1759 git-svn-id: http://svn.osgeo.org/qgis/trunk@12833
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Globe sync button disabled
 
-2010-01-24  jef 
+Pirmin Kalberer 	2012-10-16
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12832
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use ViewerWidget and Controls from OsgEarth instead of backports
 
-2010-01-24  jef 
+Pirmin Kalberer 	2012-10-08
 
-	* src/app/qgisappinterface.cpp, src/core/raster/qgsrasterlayer.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h: fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@12831
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add sky to globe
 
-2010-01-24  jef 
+Pirmin Kalberer 	2012-10-08
 
-	* python/core/qgsgeometry.sip, src/app/qgsmaptooladdfeature.cpp,
-	src/app/qgsmaptooladdisland.cpp, src/app/qgsmaptooladdring.cpp,
-	src/app/qgsmaptoolcapture.cpp, src/app/qgsmaptoolcapture.h,
-	src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolreshape.cpp,
-	src/app/qgsmaptoolsplitfeatures.cpp, src/core/qgsgeometry.cpp,
-	src/core/qgsgeometry.h: [FEATURE] add validation to capture tool git-svn-id: http://svn.osgeo.org/qgis/trunk@12830
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Globe zoomout button size fixed
 
-2010-01-24  jef 
+Martin Dobias 	2012-10-19
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassselect.cpp: fix grass string git-svn-id: http://svn.osgeo.org/qgis/trunk@12829
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    QgsFeature: use a vector of attributes instead of a map (for faster access)
 
-2010-01-23  jef 
+Giuseppe Sucameli 	2012-10-18
 
-	* python/gui/qgisinterface.sip, python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/app/legend/qgslegend.cpp, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgisappinterface.cpp,
-	src/app/qgisappinterface.h, src/gui/qgisinterface.h,
-	src/gui/qgslegendinterface.h: allow opening properties dialog for
-	layer from plugins (better version of r12814) git-svn-id: http://svn.osgeo.org/qgis/trunk@12828
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix crash double-clicking to the Connect button in add PG layer dialog
 
-2010-01-23  kyngchaos 
+Giuseppe Sucameli 	2012-10-18
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: use 4-file split for
-	python modules as in cmake build, should compile more parallel now
-	for single-arch build git-svn-id: http://svn.osgeo.org/qgis/trunk@12827
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix crash adding features without geometry to a geometry layer
 
-2010-01-23  kyngchaos 
+Giuseppe Sucameli 	2012-10-18
 
-	* mac/xcode/qgis_settings.xcconfig: forgot version up after 1.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@12826
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    update feature id of added features (fix #6534)
 
-2010-01-23  jef 
+Juergen E. Fischer 	2012-10-18
 
-	* src/app/qgslabeldialog.cpp, src/ui/qgslabeldialogbase.ui: pack
-	label dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12825
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix of by one in d62cf513
 
-2010-01-23  timlinux 
+Radim Blazek 	2012-10-18
 
-	* src/ui/qgslabeldialogbase.ui: Label dialog: Fix buddies and tab
-	order git-svn-id: http://svn.osgeo.org/qgis/trunk@12824
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster identify sip fix
 
-2010-01-23  timlinux 
+Juergen E. Fischer 	2012-10-18
 
-	* src/ui/qgslabeldialogbase.ui: Label dialog: Remove the toolbox and
-	use tabs and scroll areas rather git-svn-id: http://svn.osgeo.org/qgis/trunk@12823
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-01-23  macho 
+Sandro Santilli 	2012-10-17
 
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12822
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Reword "only look in geometry_columns" to "only look in layers registry"
+    
+    Fixes #4533
 
-2010-01-23  timlinux 
+Juergen E. Fischer 	2012-10-18
 
-	* : Updates as per #2385 git-svn-id: http://svn.osgeo.org/qgis/trunk@12821
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-01-22  mhugent 
+Juergen E. Fischer 	2012-10-18
 
-	* python/core/symbology-ng-core.sip: sync sip file for
-	symbolv2rendercontext git-svn-id: http://svn.osgeo.org/qgis/trunk@12820
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    cleanup topology lookup
 
-2010-01-22  gsherman 
+Sandro Santilli 	2012-10-14
 
-	* src/plugins/oracle_raster/qgsoracleconnect_ui.cpp,
-	src/plugins/oracle_raster/qgsoracleconnect_ui.h: Fix for bug #2384.
-	Ok and Cancel buttons now work on the add new oracle raster
-	connection dialog.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12819
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Lookup TopoGeometry columns metadata in topology.layer
+    
+    Closes #4532
 
-2010-01-22  wonder 
+Radim Blazek 	2012-10-18
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp: Use ARGB
-	premultiplied format for simple marker, fixed multiplication of
-	alpha channel for images with premultiplied format.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12818
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    WMS identify fixes
 
-2010-01-22  wonder 
+Alexander Bruy 	2012-10-18
 
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/ui/qgssymbolv2selectordialogbase.ui: Fixed symbol selector UI,
-	use just one symbol color button instead of former three buttons git-svn-id: http://svn.osgeo.org/qgis/trunk@12817
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add layer with its own CRS when possible (fix #6539)
 
-2010-01-22  mhugent 
+Alexander Bruy 	2012-10-18
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: premultiplied
-	image seems to work for svg fill git-svn-id: http://svn.osgeo.org/qgis/trunk@12816
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6530
 
-2010-01-22  mhugent 
+Alexander Bruy 	2012-10-18
 
-	* src/core/raster/qgsrasterlayer.cpp: Fix for multiband raster
-	display git-svn-id: http://svn.osgeo.org/qgis/trunk@12815
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix SEXTANTE crash on load caused by c4c3fecf17
 
-2010-01-21  jef 
+Marco Hugentobler 	2012-10-18
 
-	* python/gui/qgslegendinterface.sip,
-	src/app/legend/qgsapplegendinterface.cpp,
-	src/app/legend/qgsapplegendinterface.h,
-	src/gui/qgslegendinterface.h: [FEATURE] allow opening layer
-	properties from plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@12814
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix build
 
-2010-01-21  jef 
+Giuseppe Sucameli 	2012-10-13
 
-	* src/app/qgsidentifyresults.cpp, src/app/qgsmaptoolidentify.cpp: 
-	raise attribute dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12813
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    set focus to python console when shown even if in a tabbed dockwidget
 
-2010-01-21  jef 
+Giuseppe Sucameli 	2012-10-11
 
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: fix windows build error git-svn-id: http://svn.osgeo.org/qgis/trunk@12812
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    sextanteexampleprovider: move import into classFactory function
 
-2010-01-21  mhugent 
+D'Hont René-Luc 	2012-10-18
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/ui/qgssymbolv2selectordialogbase.ui: Added layer transparency to
-	symbol classes (with the exception of svg marker, where I'm still
-	looking for a solution with QPicture) git-svn-id: http://svn.osgeo.org/qgis/trunk@12811
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    #6533 QGIS WFS Server Transaction Request
 
-2010-01-21  wonder 
+Juergen E. Fischer 	2012-10-18
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Start with
-	transparent background with svg fill.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12810
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix warnings
 
-2010-01-21  mhugent 
+Juergen E. Fischer 	2012-10-17
 
-	* src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h: Draw GDAL rasters and WMS layers
-	in several parts if they contain many pixels (e.g. when printing in
-	high resolution to large paper sizes) git-svn-id: http://svn.osgeo.org/qgis/trunk@12809
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german translation update
 
-2010-01-20  wonder 
+Juergen E. Fischer 	2012-10-17
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/ui/symbollayer/widget_fontmarker.ui: Fixed positioning of font
-	markers with rotation (#2380).  Allow rotation up to 360 degrees in
-	the settings widget.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12808
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix windows build
 
-2010-01-20  mhugent 
+Merge: c4c3fec fa84588
+Victor Olaya 	2012-10-17
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp: Save path for svg
-	texture absolute or relative git-svn-id: http://svn.osgeo.org/qgis/trunk@12807
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-01-20  jef 
+Victor Olaya 	2012-10-17
 
-	* src/app/qgsattributedialog.cpp, src/app/qgsattributedialog.h,
-	src/app/qgsidentifyresults.cpp: [FEATURE] identify tool update - attribute form now non-modal in view mode (since r12796) - highlight disappear when window is deactivate or closed and
-	  reappears when reactivated.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12806
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Several patches contributed by Rado Guzinski:
+    -New OTB descriptions an help
+    -Update OTB descriptions
+    -More responsive MultipleInputPanel.py
+    -Minor bug fixes
 
-2010-01-20  jef 
+pcav 	2012-10-17
 
-	* ms-windows/osgeo4w/package.cmd: update package.cmd git-svn-id: http://svn.osgeo.org/qgis/trunk@12805
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Microfix for IT GUI
 
-2010-01-20  kyngchaos 
+Merge: df85492 bacf0bd
+Marco Hugentobler 	2012-10-17
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: font marker layer
-	(r12794) git-svn-id: http://svn.osgeo.org/qgis/trunk@12804
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'ows_attribute_exclude'
 
-2010-01-20  wonder 
+Marco Hugentobler 	2012-10-17
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Fixed #2379 - hang
-	on line width set to zero (division by zero) git-svn-id: http://svn.osgeo.org/qgis/trunk@12803
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve ows gui
 
-2010-01-20  mhugent 
+Radim Blazek 	2012-10-17
 
-	* images/images.qrc: Remove deprecated icon file from list in
-	images.qrc git-svn-id: http://svn.osgeo.org/qgis/trunk@12802
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    raster identify context, QVariant values, enables wcs caching and makes wms more robust
 
-2010-01-20  mhugent 
+Marco Hugentobler 	2012-10-17
 
-	* src/core/composer/qgspaperitem.cpp,
-	src/core/composer/qgspaperitem.h, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h: Make composer a bit more robust against
-	accidential mouse clicks git-svn-id: http://svn.osgeo.org/qgis/trunk@12801
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Implement attribute restrictions in wms/wfs servers
 
-2010-01-20  borysiasty 
+Marco Hugentobler 	2012-10-17
 
-	* : remove a depreciated icon file git-svn-id: http://svn.osgeo.org/qgis/trunk@12800
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE]: possibility to exclude vector attributes from WMS and WFS publication
 
-2010-01-20  pcav 
+Merge: 5a6401c 0478d3b
+Marco Hugentobler 	2012-10-16
 
-	* i18n/qgis_it.ts: Improvements to the IT GUI transaltion git-svn-id: http://svn.osgeo.org/qgis/trunk@12799
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'wms_selective_publish'
 
-2010-01-19  macho 
+Marco Hugentobler 	2012-10-16
 
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12798
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Consider embedded groups for restricted WMS layers / groups
 
-2010-01-19  mhugent 
+Marco Hugentobler 	2012-10-16
 
-	* src/gui/qgscomposerview.cpp: Fix for a crash in composer (fixes
-	#2374) git-svn-id: http://svn.osgeo.org/qgis/trunk@12797
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Use collapsible group boxes for wms options to save space
 
-2010-01-19  jef 
+Marco Hugentobler 	2012-10-16
 
-	* src/app/qgsattributedialog.cpp, src/app/qgsattributedialog.h,
-	src/app/qgsidentifyresults.cpp: open attribute dialogs non-modal
-	when not in editing mode git-svn-id: http://svn.osgeo.org/qgis/trunk@12796
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Optionally show embedded layers/groups in selection dialog
 
-2010-01-19  jef 
+Marco Hugentobler 	2012-10-16
 
-	* src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h: pass password on to geometry
-	type detection thread git-svn-id: http://svn.osgeo.org/qgis/trunk@12795
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Improve layer/group selection dialog
 
-2010-01-18  wonder 
+Radim Blazek 	2012-10-16
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/core/symbology-ng/qgssymbolv2.cpp, src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/characterwidget.cpp,
-	src/gui/symbology-ng/characterwidget.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/ui/CMakeLists.txt, src/ui/symbollayer/widget_fontmarker.ui: 
-	[FEATURE] Added font marker symbol layer git-svn-id: http://svn.osgeo.org/qgis/trunk@12794
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    VSI/CPLMalloc/Free replaced by QgsMalloc/Free where feasible
 
-2010-01-18  ersts 
+Radim Blazek 	2012-10-16
 
-	* src/core/raster/qgsrasterlayer.cpp: -Patch for slowdown or
-	segfault when zooming very far into rasters.  -Closes ticket #2268 git-svn-id: http://svn.osgeo.org/qgis/trunk@12793
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    undersampling if possible in QgsRasterDataProvider, multicolor widget loadMinMax fix
 
-2010-01-18  macho 
+Marco Hugentobler 	2012-10-16
 
-	* i18n/qgis_bg.ts, i18n/qgis_is.ts: translation update: is and bg by
-	thordur and Zahari git-svn-id: http://svn.osgeo.org/qgis/trunk@12792
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Load/Save restricted layers for WMS server
 
-2010-01-18  wonder 
+Marco Hugentobler 	2012-10-16
 
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Added vertical line
-	to simple marker symbol layer.  Added rotation for ellipse, cross
-	and line markers.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12791
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Add gui for WMS layer restriction
 
-2010-01-18  kyngchaos 
+Larry Shaffer 	2012-10-15
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: dash line symbology
-	(r12788) git-svn-id: http://svn.osgeo.org/qgis/trunk@12790
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Turn off failing PAL engine test, until redesigned
 
-2010-01-18  mhugent 
+Werner Macho 	2012-10-16
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp: Better update of
-	line pattern icon git-svn-id: http://svn.osgeo.org/qgis/trunk@12789
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    forgot png files, thanks Larry
 
-2010-01-18  mhugent 
+Werner Macho 	2012-10-16
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/gui/CMakeLists.txt,
-	src/gui/symbology-ng/qgsdashspacedialog.cpp,
-	src/gui/symbology-ng/qgsdashspacedialog.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/ui/symbollayer/qgsdashspacedialogbase.ui,
-	src/ui/symbollayer/widget_simpleline.ui: Added option for custom
-	dash-space pattern in simple line symbollayer git-svn-id: http://svn.osgeo.org/qgis/trunk@12788
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    translation update: gl_ES by XAN and sr_Latn by Goran, also added sr_Cyrl as requested, renamed sr_CS-* to sr_*
 
-2010-01-17  kyngchaos 
+Merge: 4b76e69 4f98420
+Victor Olaya 	2012-10-16
 
-	* INSTALL, doc/INSTALL.t2t, mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: fix some missing lib paths,
-	install instructions cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@12787
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-01-16  kyngchaos 
+Victor Olaya 	2012-10-16
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: missed sip include dir git-svn-id: http://svn.osgeo.org/qgis/trunk@12786
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    put modeler parameters panel in a scroll widget
 
-2010-01-16  rblazek 
+Alexander Bruy 	2012-10-15
 
-	* src/core/qgsproviderregistry.cpp: add load library error git-svn-id: http://svn.osgeo.org/qgis/trunk@12785
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    add new plugin installer icons to CMakeLists.txt
 
-2010-01-16  kyngchaos 
+Radim Blazek 	2012-10-15
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: missed gpsimporter
-	plugin update git-svn-id: http://svn.osgeo.org/qgis/trunk@12784
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    #6504 fix - raster reprojection crash
 
-2010-01-16  kyngchaos 
+Marco Hugentobler 	2012-10-15
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig,
-	mac/xcode/src/x_python_dummy.cpp: faster python compiling (r12774)
-	misc updates git-svn-id: http://svn.osgeo.org/qgis/trunk@12783
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE]: Possibility to restrict layers / groups from WMS publication
 
-2010-01-16  rblazek 
+Merge: cdb9abd d06203b
+Victor Olaya 	2012-10-14
 
-	* src/plugins/grass/qgsgrassplugin.cpp,
-	src/plugins/grass/qgsgrassselect.cpp: fixed #2003, crash if topo is
-	not available git-svn-id: http://svn.osgeo.org/qgis/trunk@12782
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-01-16  rblazek 
+Victor Olaya 	2012-10-14
 
-	* src/providers/grass/qgsgrass.cpp: note about exceptions in GRASS
-	lib (-fexception) git-svn-id: http://svn.osgeo.org/qgis/trunk@12781
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Minor fix in ModelerParametersDialog.py.
 
-2010-01-16  kyngchaos 
+Larry Shaffer 	2012-10-14
 
-	* cmake/SIPMacros.cmake: syntax fix git-svn-id: http://svn.osgeo.org/qgis/trunk@12780
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Initialize default font in labeling engine
 
-2010-01-16  kyngchaos 
+Juergen E. Fischer 	2012-10-14
 
-	* cmake/SIPMacros.cmake: link python modules as modules on OSX git-svn-id: http://svn.osgeo.org/qgis/trunk@12779
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    postgres provider: fix quoting
 
-2010-01-16  mhugent 
+Juergen E. Fischer 	2012-10-14
 
-	* src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h: Display polygon
-	outline icon on button for svg fill symbol layer git-svn-id: http://svn.osgeo.org/qgis/trunk@12778
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #6502
 
-2010-01-16  mhugent 
+Juergen E. Fischer 	2012-10-14
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbollayerv2widget.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/ui/symbollayer/widget_svgfill.ui: [FEATURE]: SVG fill symbol
-	layer for polygon textures git-svn-id: http://svn.osgeo.org/qgis/trunk@12777
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix visibility tracking of tile scale widget
 
-2010-01-16  wonder 
+Merge: fbca157 83cb4ef
+Victor Olaya 	2012-10-14
 
-	* INSTALL, doc/INSTALL.t2t: Installation guide: updated QGIS deps
-	(minimal sip version set to 4.8, geos to 3.0, added qwt) Regenerated
-	INSTALL file.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12776
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-2010-01-16  wonder 
+Victor Olaya 	2012-10-14
 
-	* cmake/FindSIP.cmake, cmake/SIPMacros.cmake: Changed SIP_EXECUTABLE
-	to SIP_BINARY_PATH to keep original variable name.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12775
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed problem with new modeler parameters dialog when algs have vector layers (just removed worng pasted code from normal parameters dialog)
 
-2010-01-16  wonder 
+Larry Shaffer 	2012-10-12
 
-	* CMakeLists.txt, cmake/FindLibPython.py, cmake/FindPyQt.py,
-	cmake/FindPyQt4.cmake, cmake/FindPythonLibrary.cmake,
-	cmake/FindSIP.cmake, cmake/FindSIP.py, cmake/PyQt4Macros.cmake,
-	cmake/Python.cmake, cmake/PythonCompile.py,
-	cmake/PythonMacros.cmake, cmake/SIPMacros.cmake,
-	python/CMakeLists.txt, python/configure.py.in,
-	python/qgisconfig.py.in, src/CMakeLists.txt: Native and faster
-	compilation of python bindings (#2370) git-svn-id: http://svn.osgeo.org/qgis/trunk@12774
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Initial test for PAL engine
+    
+    - Includes small custom test font based of off Gnu Free Sans
+    - Test if font can be stored and loaded
+    - Test if layer can have PAL engine set
+    - Test render comparison for output of vector line layer
 
-2010-01-16  wonder 
+Merge: e576d93 30c08cb
+Jürgen Fischer 	2012-10-13
 
-	* src/ui/qgssymbolv2selectordialogbase.ui,
-	src/ui/symbollayer/widget_markerline.ui,
-	src/ui/symbollayer/widget_simplefill.ui,
-	src/ui/symbollayer/widget_simpleline.ui,
-	src/ui/symbollayer/widget_simplemarker.ui,
-	src/ui/symbollayer/widget_svgmarker.ui: Increased precision of spin
-	boxes for size/width to 2 decimals git-svn-id: http://svn.osgeo.org/qgis/trunk@12773
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #291 from strk/topogeom_and_geometry
+    
+    Find topogeometry fields in tables with a geometry/geography field
 
-2010-01-16  wonder 
+Juergen E. Fischer 	2012-10-14
 
-	* src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h: Corrected default
-	symbol layer sizes to work with milimeters git-svn-id: http://svn.osgeo.org/qgis/trunk@12772
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-15  wonder 
+    fix windows build
 
-	* python/gui/gui.sip, python/gui/qgscolorbutton.sip,
-	src/gui/qgscolorbutton.cpp, src/gui/qgscolorbutton.h,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: PyQGIS: added
-	QgsColorButton and QgsColorButtonV2 git-svn-id: http://svn.osgeo.org/qgis/trunk@12771
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-14
 
-2010-01-15  timlinux 
+    Find topogeometry fields in tables with a geometry/geography field
+    
+    Closes bug #6510
 
-	* : Added Italian srs defs. Paolo please test git-svn-id: http://svn.osgeo.org/qgis/trunk@12770
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-13
 
-2010-01-15  wonder 
+    missed import in SEXTANTE modeller
 
-	* python/core/symbology-ng-core.sip,
-	python/gui/symbology-ng-gui.sip,
-	src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.cpp,
-	src/core/symbology-ng/qgsrendererv2registry.h,
-	src/core/symbology-ng/qgssymbollayerv2registry.cpp,
-	src/core/symbology-ng/qgssymbollayerv2registry.h,
-	src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp: symbology-ng:
-	updates to symbol layer registry and renderer registry so that they
-	can be used from python.  Added wrappers for these two registries
-	and their metadata classes.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12769
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-15  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: gps detection
-	imporvements (r12759) and other cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@12768
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-15  jef 
-
-	* src/app/qgsmaptoolnodetool.cpp, src/core/qgsgeometry.cpp,
-	src/core/qgsgeometry.h: more geometry validity checks git-svn-id: http://svn.osgeo.org/qgis/trunk@12767
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-15  wonder 
-
-	* src/core/symbology-ng/qgssymbologyv2conversion.cpp: Fixed
-	conversions between V1 and V2 symbols: don't convert pixels<->mm
-	anymore git-svn-id: http://svn.osgeo.org/qgis/trunk@12766
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  mhugent 
-
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp: Prevent division
-	by 0 git-svn-id: http://svn.osgeo.org/qgis/trunk@12764
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  mhugent 
-
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/core/symbology-ng/qgssymbolv2.cpp: Create a better fake
-	rendercontext for symbol previews git-svn-id: http://svn.osgeo.org/qgis/trunk@12763
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  wonder 
-
-	* src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h: Refactored output
-	unit encoding/decoding to their own functions git-svn-id: http://svn.osgeo.org/qgis/trunk@12762
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  jef 
-
-	* src/core/gps/qextserialport/qextserialport.h: fix r12759 git-svn-id: http://svn.osgeo.org/qgis/trunk@12761
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  wonder 
-
-	* src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/ui/qgssymbolv2selectordialogbase.ui: Updated symbol selector GUI
-	to reflect the design created with Tim git-svn-id: http://svn.osgeo.org/qgis/trunk@12760
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  jef 
-
-	* src/app/CMakeLists.txt, src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsinformationwidget.h, src/core/CMakeLists.txt,
-	src/core/gps/qextserialport/posix_qextserialport.cpp,
-	src/core/gps/qextserialport/qextserialport.h,
-	src/core/gps/qextserialport/qwineventnotifier.h,
-	src/core/gps/qextserialport/win_qextserialport.cpp,
-	src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h,
-	src/core/gps/qgsgpsdetector.cpp, src/core/gps/qgsgpsdetector.h,
-	src/core/gps/qgsgpstrackerthread.cpp,
-	src/core/gps/qgsgpstrackerthread.h,
-	src/core/gps/qgsnmeaconnection.cpp,
-	src/core/gps/qgsnmeaconnection.h,
-	src/plugins/gps_importer/CMakeLists.txt,
-	src/plugins/gps_importer/qgsgpsplugingui.cpp: improve gps detection git-svn-id: http://svn.osgeo.org/qgis/trunk@12759
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  jef 
-
-	* src/core/qgscoordinatereferencesystem.cpp,
-	src/core/qgsmaprenderer.cpp: reduce debugging noise git-svn-id: http://svn.osgeo.org/qgis/trunk@12758
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  wonder 
-
-	* src/core/symbology-ng/qgsmarkersymbollayerv2.cpp: Fixed what I've
-	broken with previous commit git-svn-id: http://svn.osgeo.org/qgis/trunk@12757
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-14  wonder 
-
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h: QgsSymbolV2RenderContext: - use reference to QgsRenderContext instead of pointer - added utility functions for simpler syntax when converting values
-	to output units git-svn-id: http://svn.osgeo.org/qgis/trunk@12756
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-10-13
 
-2010-01-14  mhugent 
+    Removed unused QgsFeature::isDirty() and QgsFeature::clean()
 
-	* python/core/symbology-ng-core.sip,
-	src/core/symbology-ng/qgsfillsymbollayerv2.cpp,
-	src/core/symbology-ng/qgsfillsymbollayerv2.h,
-	src/core/symbology-ng/qgslinesymbollayerv2.cpp,
-	src/core/symbology-ng/qgslinesymbollayerv2.h,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp,
-	src/core/symbology-ng/qgsmarkersymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2.cpp,
-	src/core/symbology-ng/qgssymbollayerv2.h,
-	src/core/symbology-ng/qgssymbollayerv2utils.cpp,
-	src/core/symbology-ng/qgssymbollayerv2utils.h,
-	src/core/symbology-ng/qgssymbolv2.cpp,
-	src/core/symbology-ng/qgssymbolv2.h,
-	src/gui/symbology-ng/qgssymbollayerv2widget.cpp,
-	src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.cpp,
-	src/gui/symbology-ng/qgssymbolv2selectordialog.h,
-	src/ui/qgssymbolv2selectordialogbase.ui,
-	src/ui/symbollayer/widget_markerline.ui,
-	src/ui/symbollayer/widget_simplefill.ui,
-	src/ui/symbollayer/widget_simpleline.ui,
-	src/ui/symbollayer/widget_simplemarker.ui,
-	src/ui/symbollayer/widget_svgmarker.ui: [FEATURE]: choice between mm
-	and map units for new symbology. Scaling to use new symbology in
-	print composer as well git-svn-id: http://svn.osgeo.org/qgis/trunk@12755
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-10-13
 
-2010-01-13  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: restore app build of
-	qgis_help git-svn-id: http://svn.osgeo.org/qgis/trunk@12754
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-13  kyngchaos 
-
-	* src/core/qgsapplication.cpp, src/helpviewer/CMakeLists.txt,
-	src/helpviewer/main.cpp: restore previous bundle build of helpviewer
-	(r12622), add 2nd install step to correct install_name (fix #2294) git-svn-id: http://svn.osgeo.org/qgis/trunk@12753
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12752
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* src/core/qgsexception.h, src/plugins/grass/qgsgrassplugin.cpp,
-	src/providers/grass/qgsgrass.cpp, src/providers/grass/qgsgrass.h: 
-	derive QgsGrass::Exception from QgsException git-svn-id: http://svn.osgeo.org/qgis/trunk@12751
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* i18n/qgis_de.ts: german translation fix git-svn-id: http://svn.osgeo.org/qgis/trunk@12750
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* src/app/qgsmaptoolnodetool.cpp, src/app/qgsmaptoolnodetool.h,
-	src/core/qgsgeometry.cpp, src/core/qgsgeometry.h,
-	src/core/qgspoint.cpp, src/core/qgspoint.h: [FEATURE] allow editing
-	of invalid geometry in node tool git-svn-id: http://svn.osgeo.org/qgis/trunk@12749
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* src/core/gps/qgsgpsconnection.h: missed a file in r12747 git-svn-id: http://svn.osgeo.org/qgis/trunk@12748
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/core/gps/qgsgpsconnection.cpp,
-	src/plugins/gps_importer/qgsgpsplugingui.cpp,
-	src/ui/qgsgpsinformationwidgetbase.ui: also show descriptions for
-	GPS ports git-svn-id: http://svn.osgeo.org/qgis/trunk@12747
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  rblazek 
-
-	* src/plugins/grass/qgsgrassmodel.cpp: catch GRASS exceptions git-svn-id: http://svn.osgeo.org/qgis/trunk@12746
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  jef 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: fix #2358 git-svn-id: http://svn.osgeo.org/qgis/trunk@12745
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  macho 
-
-	* i18n/qgis_hr_HR.ts: translation update: hr by Zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12744
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-12  mhugent 
-
-	* src/app/qgisapp.cpp: Fix for ticket #2354 git-svn-id: http://svn.osgeo.org/qgis/trunk@12743
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  timlinux 
-
-	* src/app/qgsoptions.cpp, src/app/qgswmssourceselect.cpp,
-	src/ui/qgsoptionsbase.ui: [FEATURE] Made wms search server user
-	configurable git-svn-id: http://svn.osgeo.org/qgis/trunk@12740
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  jef 
-
-	* src/core/gps/qgsgpsconnection.cpp,
-	src/plugins/gps_importer/CMakeLists.txt,
-	src/plugins/gps_importer/qgsgpsplugingui.cpp: use
-	QgsGPSConnection::availablePorts() also in gps plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@12739
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  rblazek 
-
-	* src/providers/grass/qgsgrassprovider.cpp: fix for #1095 git-svn-id: http://svn.osgeo.org/qgis/trunk@12738
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  jef 
-
-	* src/core/gps/qextserialport/ChangeLog,
-	src/core/gps/qextserialport/Doxyfile,
-	src/core/gps/qextserialport/doc/mainpage.dox,
-	src/core/gps/qextserialport/doc/qextbasetype.dox,
-	src/core/gps/qextserialport/doc/qiodevice.tag,
-	src/core/gps/qextserialport/examples/enumerator/enumerator.pro,
-	src/core/gps/qextserialport/examples/enumerator/main.cpp,
-	src/core/gps/qextserialport/examples/event/PortListener.cpp,
-	src/core/gps/qextserialport/examples/event/PortListener.h,
-	src/core/gps/qextserialport/examples/event/event.pro,
-	src/core/gps/qextserialport/examples/event/main.cpp,
-	src/core/gps/qextserialport/examples/qespta/MainWindow.cpp,
-	src/core/gps/qextserialport/examples/qespta/MainWindow.h,
-	src/core/gps/qextserialport/examples/qespta/Makefile,
-	src/core/gps/qextserialport/examples/qespta/Makefile.Debug,
-	src/core/gps/qextserialport/examples/qespta/Makefile.Release,
-	src/core/gps/qextserialport/examples/qespta/MessageWindow.cpp,
-	src/core/gps/qextserialport/examples/qespta/MessageWindow.h,
-	src/core/gps/qextserialport/examples/qespta/QESPTA.pro,
-	src/core/gps/qextserialport/examples/qespta/QespTest.cpp,
-	src/core/gps/qextserialport/examples/qespta/QespTest.h,
-	src/core/gps/qextserialport/examples/qespta/README,
-	src/core/gps/qextserialport/examples/qespta/defs.h,
-	src/core/gps/qextserialport/examples/qespta/main.cpp,
-	src/core/gps/qextserialport/html/annotated.html,
-	src/core/gps/qextserialport/html/classPosix__QextSerialPort-members
-	.html,
-	src/core/gps/qextserialport/html/classPosix__QextSerialPort.html,
-	src/core/gps/qextserialport/html/classQextBaseType-members.html,
-	src/core/gps/qextserialport/html/classQextBaseType.html,
-	src/core/gps/qextserialport/html/classQextSerialBase-members.html,
-	src/core/gps/qextserialport/html/classQextSerialBase.html,
-	src/core/gps/qextserialport/html/classQextSerialPort-members.html,
-	src/core/gps/qextserialport/html/classQextSerialPort.html,
-	src/core/gps/qextserialport/html/classWin__QextSerialPort-members.h
-	tml,
-	src/core/gps/qextserialport/html/classWin__QextSerialPort.html,
-	src/core/gps/qextserialport/html/classes.html,
-	src/core/gps/qextserialport/html/doxygen.css,
-	src/core/gps/qextserialport/html/files.html,
-	src/core/gps/qextserialport/html/functions.html,
-	src/core/gps/qextserialport/html/functions_func.html,
-	src/core/gps/qextserialport/html/functions_vars.html,
-	src/core/gps/qextserialport/html/globals.html,
-	src/core/gps/qextserialport/html/globals_enum.html,
-	src/core/gps/qextserialport/html/globals_eval.html,
-	src/core/gps/qextserialport/html/hierarchy.html,
-	src/core/gps/qextserialport/html/index.html,
-	src/core/gps/qextserialport/html/installdox,
-	src/core/gps/qextserialport/html/main.html,
-	src/core/gps/qextserialport/html/mainpage_8dox.html,
-	src/core/gps/qextserialport/html/posix__qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/posix__qextserialport_8h.html,
-	src/core/gps/qextserialport/html/qextbasetype_8dox.html,
-	src/core/gps/qextserialport/html/qextserialbase_8cpp.html,
-	src/core/gps/qextserialport/html/qextserialbase_8h.html,
-	src/core/gps/qextserialport/html/qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/qextserialport_8h.html,
-	src/core/gps/qextserialport/html/structPortSettings-members.html,
-	src/core/gps/qextserialport/html/structPortSettings.html,
-	src/core/gps/qextserialport/html/tabs.css,
-	src/core/gps/qextserialport/html/tree.html,
-	src/core/gps/qextserialport/html/win__qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/win__qextserialport_8h.html,
-	src/core/gps/qextserialport/qextserialport.pro: remove unused files
-	from qextserialport git-svn-id: http://svn.osgeo.org/qgis/trunk@12737
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  jef 
-
-	* src/core/CMakeLists.txt: fix osx build git-svn-id: http://svn.osgeo.org/qgis/trunk@12736
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_settings.xcconfig: new python console (r12725,
-	r12727) better serial port handling (r12732) add phonon and QtDBus
-	to bundling needed by Webkit git-svn-id: http://svn.osgeo.org/qgis/trunk@12735
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  wonder 
-
-	* src/core/gps/qgsgpsconnection.cpp: fixed compliation errors on
-	linux git-svn-id: http://svn.osgeo.org/qgis/trunk@12734
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  jef 
-
-	* src/core/CMakeLists.txt,
-	src/core/gps/qextserialport/qextserialenumerator.h,
-	src/core/gps/qgsgpsconnection.cpp: fix r12732 git-svn-id: http://svn.osgeo.org/qgis/trunk@12733
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  jef 
-
-	* scripts/prepare-commit.sh,
-	src/app/gps/qgsgpsinformationwidget.cpp, src/core/CMakeLists.txt,
-	src/core/gps/posix_qextserialport.cpp,
-	src/core/gps/posix_qextserialport.h,
-	src/core/gps/qextserialbase.cpp, src/core/gps/qextserialbase.h,
-	src/core/gps/qextserialport.cpp, src/core/gps/qextserialport.h,
-	src/core/gps/qextserialport/ChangeLog,
-	src/core/gps/qextserialport/Doxyfile,
-	src/core/gps/qextserialport/doc/mainpage.dox,
-	src/core/gps/qextserialport/doc/qextbasetype.dox,
-	src/core/gps/qextserialport/doc/qiodevice.tag,
-	src/core/gps/qextserialport/examples/enumerator/enumerator.pro,
-	src/core/gps/qextserialport/examples/enumerator/main.cpp,
-	src/core/gps/qextserialport/examples/event/PortListener.cpp,
-	src/core/gps/qextserialport/examples/event/PortListener.h,
-	src/core/gps/qextserialport/examples/event/event.pro,
-	src/core/gps/qextserialport/examples/event/main.cpp,
-	src/core/gps/qextserialport/examples/qespta/MainWindow.cpp,
-	src/core/gps/qextserialport/examples/qespta/MainWindow.h,
-	src/core/gps/qextserialport/examples/qespta/Makefile,
-	src/core/gps/qextserialport/examples/qespta/Makefile.Debug,
-	src/core/gps/qextserialport/examples/qespta/Makefile.Release,
-	src/core/gps/qextserialport/examples/qespta/MessageWindow.cpp,
-	src/core/gps/qextserialport/examples/qespta/MessageWindow.h,
-	src/core/gps/qextserialport/examples/qespta/QESPTA.pro,
-	src/core/gps/qextserialport/examples/qespta/QespTest.cpp,
-	src/core/gps/qextserialport/examples/qespta/QespTest.h,
-	src/core/gps/qextserialport/examples/qespta/README,
-	src/core/gps/qextserialport/examples/qespta/defs.h,
-	src/core/gps/qextserialport/examples/qespta/main.cpp,
-	src/core/gps/qextserialport/html/annotated.html,
-	src/core/gps/qextserialport/html/classPosix__QextSerialPort-members
-	.html,
-	src/core/gps/qextserialport/html/classPosix__QextSerialPort.html,
-	src/core/gps/qextserialport/html/classQextBaseType-members.html,
-	src/core/gps/qextserialport/html/classQextBaseType.html,
-	src/core/gps/qextserialport/html/classQextSerialBase-members.html,
-	src/core/gps/qextserialport/html/classQextSerialBase.html,
-	src/core/gps/qextserialport/html/classQextSerialPort-members.html,
-	src/core/gps/qextserialport/html/classQextSerialPort.html,
-	src/core/gps/qextserialport/html/classWin__QextSerialPort-members.h
-	tml,
-	src/core/gps/qextserialport/html/classWin__QextSerialPort.html,
-	src/core/gps/qextserialport/html/classes.html,
-	src/core/gps/qextserialport/html/doxygen.css,
-	src/core/gps/qextserialport/html/files.html,
-	src/core/gps/qextserialport/html/functions.html,
-	src/core/gps/qextserialport/html/functions_func.html,
-	src/core/gps/qextserialport/html/functions_vars.html,
-	src/core/gps/qextserialport/html/globals.html,
-	src/core/gps/qextserialport/html/globals_enum.html,
-	src/core/gps/qextserialport/html/globals_eval.html,
-	src/core/gps/qextserialport/html/hierarchy.html,
-	src/core/gps/qextserialport/html/index.html,
-	src/core/gps/qextserialport/html/installdox,
-	src/core/gps/qextserialport/html/main.html,
-	src/core/gps/qextserialport/html/mainpage_8dox.html,
-	src/core/gps/qextserialport/html/posix__qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/posix__qextserialport_8h.html,
-	src/core/gps/qextserialport/html/qextbasetype_8dox.html,
-	src/core/gps/qextserialport/html/qextserialbase_8cpp.html,
-	src/core/gps/qextserialport/html/qextserialbase_8h.html,
-	src/core/gps/qextserialport/html/qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/qextserialport_8h.html,
-	src/core/gps/qextserialport/html/structPortSettings-members.html,
-	src/core/gps/qextserialport/html/structPortSettings.html,
-	src/core/gps/qextserialport/html/tabs.css,
-	src/core/gps/qextserialport/html/tree.html,
-	src/core/gps/qextserialport/html/win__qextserialport_8cpp.html,
-	src/core/gps/qextserialport/html/win__qextserialport_8h.html,
-	src/core/gps/qextserialport/posix_qextserialport.cpp,
-	src/core/gps/qextserialport/qextserialenumerator.cpp,
-	src/core/gps/qextserialport/qextserialenumerator.h,
-	src/core/gps/qextserialport/qextserialport.cpp,
-	src/core/gps/qextserialport/qextserialport.h,
-	src/core/gps/qextserialport/qextserialport.pro,
-	src/core/gps/qextserialport/win_qextserialport.cpp,
-	src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h,
-	src/core/gps/qgsnmeaconnection.cpp,
-	src/core/gps/qgsnmeaconnection.h,
-	src/core/gps/win_qextserialport.cpp,
-	src/core/gps/win_qextserialport.h: qextserialport update (improved
-	device detection on Windows & OSX) git-svn-id: http://svn.osgeo.org/qgis/trunk@12732
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-11  wonder 
-
-	* python/console.py: use monospaced font in python console git-svn-id: http://svn.osgeo.org/qgis/trunk@12731
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-10  macho 
-
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@12729
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-10  macho 
-
-	* src/core/gps/qgsgpsconnection.cpp: added rfcomm devices in
-	autodetect to connect to bluetooth gps devices git-svn-id: http://svn.osgeo.org/qgis/trunk@12728
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-10  wonder 
-
-	* python/CMakeLists.txt, python/console.py,
-	src/ui/qgspythondialog.ui: [FEATURE] new python console
-	implementation.  Simpler, easier and better :-) git-svn-id: http://svn.osgeo.org/qgis/trunk@12727
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-10  kyngchaos 
-
-	* doc/INSTALL.t2t: add Qwt build instructions for OSX; misc cleanup
-	for OSX git-svn-id: http://svn.osgeo.org/qgis/trunk@12726
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-10  wonder 
-
-	* python/CMakeLists.txt, python/console.py, python/utils.py,
-	src/app/CMakeLists.txt, src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgspythondialog.cpp, src/app/qgspythondialog.h,
-	src/python/qgspythonutils.h, src/python/qgspythonutilsimpl.cpp,
-	src/python/qgspythonutilsimpl.h: Converted Python console from C++
-	to Python.  This cleans python support a bit and makes a starting
-	point for further improvements of the console.  It's possible to run the console also outside QGIS: import qgis.console qgis.console.show_console() git-svn-id: http://svn.osgeo.org/qgis/trunk@12725
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-09  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj, mac/xcode/ReadMe.rtf,
-	mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: move pg and ogr stuff
-	(r12702) add GPS tracking and Qwt (r12685, r12692, r12707) composer
-	table select display attribs (r12709) another composer table update
-	(r12717) misc updates phwew! note: qwt not optional for xcode
-	project due to lack of conditional sources git-svn-id: http://svn.osgeo.org/qgis/trunk@12724
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-09  jef 
-
-	* i18n/qgis_de.ts: update german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12723
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-09  jef 
-
-	* src/app/composer/qgsattributeselectiondialog.cpp,
-	src/app/qgsmaptoolcapture.h, src/core/gps/posix_qextserialport.cpp: 
-	fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@12722
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-09  jef 
-
-	* python/utils.py: fix python plugin detection git-svn-id: http://svn.osgeo.org/qgis/trunk@12721
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-09  wonder 
+    Removed unused QgsFeature::typeName() and QgsFeature::setTypeName()
 
-	* src/core/symbology-ng/qgslinesymbollayerv2.cpp: Consider also
-	original marker rotation in marker line with rotated symbols.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12720
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-12
 
-2010-01-09  timlinux 
+    german translation update
 
-	* src/ui/qgsgpsinformationwidgetbase.ui: Add a little more white
-	space to the left of the gps dock for a more balanced look.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12719
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 0e2f92f 036d844
+Victor Olaya 	2012-10-12
 
-2010-01-09  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-	* src/app/qgsabout.cpp, src/app/qgsabout.h: fix runtime warning git-svn-id: http://svn.osgeo.org/qgis/trunk@12718
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Victor Olaya 	2012-10-12
 
-2010-01-09  mhugent 
+    Updated model parameters window
+    fixed #6417
 
-	* src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h, src/core/CMakeLists.txt,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h: Adapt number of features in
-	composer table if height of the item is changed interactively git-svn-id: http://svn.osgeo.org/qgis/trunk@12717
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-09-24
 
-2010-01-08  borysiasty 
+    Fix #6373, adv labeling data defined font size not affected by layer font size setting
+    
+    - Label QFontMetricsF for data and layer defined options now stored in QgsPalGeometry
+    - Fix expression in rotate label tool
 
-	* TRANSLATORS, i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12715
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-12
 
-2010-01-08  mhugent 
+    fix warnings
 
-	* images/images.qrc: add measure angle icon to qrc file again git-svn-id: http://svn.osgeo.org/qgis/trunk@12714
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-12
 
-2010-01-08  timlinux 
+    [FEATURE] QGIS server: possibility to restrict published composers
 
-	* : Something from the 'what took you so long?' dept - trunk splash
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@12713
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f230f51 12ddac6
+mhugent 	2012-10-11
 
-2010-01-08  borysiasty 
+    Merge pull request #288 from Oslandia/atlas
+    
+    Clean up atlas pdf generation code and fix a bug on windows
 
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fr.ts, i18n/qgis_he.ts, i18n/qgis_hr_HR.ts,
-	i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts,
-	i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts,
-	i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: TS files fix/update - revert strings gone in
-	r12680 and add the grass plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@12712
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-11
 
-2010-01-08  timlinux 
+    Remove extraneous Mac browser app aliases
+    
+    - Should handle Finder pref set to hide extensions (e.g. missing .app)
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: Fix issue where gps
-	tracker was not being restored properly on subsequent qgis launches.
-	Also wrapped some more conditional qwt bits git-svn-id: http://svn.osgeo.org/qgis/trunk@12711
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-11
 
-2010-01-08  jef 
+    fix sip bindings
 
-	* src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/app/qgsidentifyresults.cpp: fix runtime warning git-svn-id: http://svn.osgeo.org/qgis/trunk@12710
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-11
 
-2010-01-08  mhugent 
+    fix warnings and identation update
 
-	* src/app/CMakeLists.txt,
-	src/app/composer/qgsattributeselectiondialog.cpp,
-	src/app/composer/qgsattributeselectiondialog.h,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h,
-	src/ui/qgscomposertablewidgetbase.ui: Added selection of display
-	attributes and aliases to composer table item git-svn-id: http://svn.osgeo.org/qgis/trunk@12709
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 0c4846b def6486
+Alexander Bruy 	2012-10-11
 
-2010-01-08  jef 
+    Merge remote-tracking branch 'upstream/master'
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12708
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9ad9f8c 78a9bd7
+Martin Dobias 	2012-10-11
 
-2010-01-08  jef 
+    Merge pull request #220 from tecoholic/style-docs
+    
+    UI improvements in symbol layer widgets
 
-	* CMakeLists.txt, cmake/FindQWT.cmake, src/app/qgisapp.cpp,
-	src/app/qgisapp.h: make QWT support configurable git-svn-id: http://svn.osgeo.org/qgis/trunk@12707
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-10
 
-2010-01-08  jef 
+    remove obsolete code
 
-	* src/plugins/grass/qgsgrassmodule.cpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@12706
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-10
 
-2010-01-08  jef 
-
-	* CMakeLists.txt, images/north_arrows/gpsarrow.svg~,
-	images/north_arrows/gpsarrow2.svg~, src/app/CMakeLists.txt,
-	src/app/qgisapp.cpp, src/app/qgisapp.h,
-	src/core/gps/qgsnmeaconnection.cpp: more fixes: optional QWT git-svn-id: http://svn.osgeo.org/qgis/trunk@12705
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12704
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* src/core/gps/info.h, src/core/gps/nmeatime.h,
-	src/core/gps/time.c, src/core/gps/time.h: rename src/core/gps/time.h
-	to nmeatime.h git-svn-id: http://svn.osgeo.org/qgis/trunk@12703
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* src/app/CMakeLists.txt, src/app/ogr/qgsogrsublayersdialog.cpp,
-	src/app/ogr/qgsogrsublayersdialog.h,
-	src/app/postgres/qgspgnewconnection.cpp,
-	src/app/postgres/qgspgnewconnection.h,
-	src/app/postgres/qgspgsourceselect.cpp,
-	src/app/postgres/qgspgsourceselect.h, src/app/qgisapp.cpp,
-	src/app/qgsnewconnection.cpp, src/app/qgsnewconnection.h,
-	src/app/qgsogrsublayersdialog.cpp, src/app/qgsogrsublayersdialog.h,
-	src/app/qgspgsourceselect.cpp, src/app/qgspgsourceselect.h,
-	src/app/qgsquerybuilder.h, src/app/qgsvectorlayerproperties.cpp,
-	src/plugins/spit/CMakeLists.txt, src/plugins/spit/qgsspit.cpp,
-	src/ui/qgsnewconnectionbase.ui, src/ui/qgspgnewconnectionbase.ui: 
-	rename some postgres app classes and move a ogr class git-svn-id: http://svn.osgeo.org/qgis/trunk@12702
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* debian/control.intrepid, debian/control.jaunty,
-	debian/control.karmic, debian/control.lenny, debian/control.sid: add
-	qwt dependency to debian package git-svn-id: http://svn.osgeo.org/qgis/trunk@12701
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* python/core/qgsgeometry.sip,
-	src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptooladdfeature.h,
-	src/core/qgsgeometry.cpp, src/core/qgsgeometry.h: move
-	QgsMapToolFeature::avoidIntersections to QgsGeometry git-svn-id: http://svn.osgeo.org/qgis/trunk@12700
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* CMakeLists.txt: add -DQWT_DLL to windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@12699
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: add postgresql
-	password cache git-svn-id: http://svn.osgeo.org/qgis/trunk@12698
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  timlinux 
-
-	* src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptoolcapture.cpp,
-	src/app/qgsmaptoolcapture.h: Refactored capturetool to capturemode
-	and fixed some compile errors git-svn-id: http://svn.osgeo.org/qgis/trunk@12697
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* src/app/qgisapp.h, src/app/qgsmaptooladdfeature.cpp,
-	src/app/qgsmaptoolcapture.h, src/core/qgscoordinatetransform.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/scale_bar/pluginguibase.ui, src/ui/qgsoptionsbase.ui: 
-	more fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@12696
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* cmake/FindQWT.cmake, ms-windows/osgeo4w/package.cmd,
-	scripts/spelling.dat, src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsinformationwidget.h,
-	src/app/gps/qgsgpsmarker.cpp, src/app/gps/qgsgpsmarker.h,
-	src/app/gps/qwtpolar/qwt_polar.h,
-	src/app/gps/qwtpolar/qwt_polar_canvas.cpp,
-	src/app/gps/qwtpolar/qwt_polar_canvas.h,
-	src/app/gps/qwtpolar/qwt_polar_curve.cpp,
-	src/app/gps/qwtpolar/qwt_polar_curve.h,
-	src/app/gps/qwtpolar/qwt_polar_fitter.cpp,
-	src/app/gps/qwtpolar/qwt_polar_fitter.h,
-	src/app/gps/qwtpolar/qwt_polar_grid.cpp,
-	src/app/gps/qwtpolar/qwt_polar_grid.h,
-	src/app/gps/qwtpolar/qwt_polar_item.cpp,
-	src/app/gps/qwtpolar/qwt_polar_item.h,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.cpp,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.h,
-	src/app/gps/qwtpolar/qwt_polar_layout.cpp,
-	src/app/gps/qwtpolar/qwt_polar_layout.h,
-	src/app/gps/qwtpolar/qwt_polar_magnifier.cpp,
-	src/app/gps/qwtpolar/qwt_polar_magnifier.h,
-	src/app/gps/qwtpolar/qwt_polar_marker.cpp,
-	src/app/gps/qwtpolar/qwt_polar_marker.h,
-	src/app/gps/qwtpolar/qwt_polar_panner.cpp,
-	src/app/gps/qwtpolar/qwt_polar_panner.h,
-	src/app/gps/qwtpolar/qwt_polar_plot.cpp,
-	src/app/gps/qwtpolar/qwt_polar_plot.h,
-	src/app/gps/qwtpolar/qwt_polar_point.cpp,
-	src/app/gps/qwtpolar/qwt_polar_point.h,
-	src/app/gps/qwtpolar/qwt_polar_spectrogram.cpp,
-	src/app/gps/qwtpolar/qwt_polar_spectrogram.h, src/core/gps/gmath.c,
-	src/core/gps/parse.c, src/core/gps/posix_qextserialport.cpp,
-	src/core/gps/posix_qextserialport.h,
-	src/core/gps/qextserialbase.cpp, src/core/gps/qextserialbase.h,
-	src/core/gps/qextserialport.cpp, src/core/gps/qextserialport.h,
-	src/core/gps/tok.c, src/core/gps/win_qextserialport.cpp,
-	src/core/gps/win_qextserialport.h: fix some issues with the GPS
-	commit git-svn-id: http://svn.osgeo.org/qgis/trunk@12695
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  timlinux 
-
-	* src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/qgsmaptooladdfeature.cpp, src/app/qgsmaptooladdfeature.h: 
-	Fixed typo git-svn-id: http://svn.osgeo.org/qgis/trunk@12694
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  timlinux 
-
-	* src/app/qgsmaptooladdfeature.h: [FEATURE] GPS Tracking widget
-	added. This is a bug fix for a missing file that should have been
-	updated in last commit git-svn-id: http://svn.osgeo.org/qgis/trunk@12693
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  timlinux 
-
-	* CMakeLists.txt, cmake/FindQWT.cmake, images/images.qrc,
-	images/north_arrows/gpsarrow.svg,
-	images/north_arrows/gpsarrow.svg~,
-	images/north_arrows/gpsarrow2.svg,
-	images/north_arrows/gpsarrow2.svg~,
-	images/themes/default/gpsicons/barchart.svg,
-	images/themes/default/gpsicons/polarchart.svg,
-	src/app/CMakeLists.txt, src/app/gps/qgsgpsinformationwidget.cpp,
-	src/app/gps/qgsgpsinformationwidget.h,
-	src/app/gps/qgsgpsmarker.cpp, src/app/gps/qgsgpsmarker.h,
-	src/app/gps/qwtpolar/qwt_polar.h,
-	src/app/gps/qwtpolar/qwt_polar_canvas.cpp,
-	src/app/gps/qwtpolar/qwt_polar_canvas.h,
-	src/app/gps/qwtpolar/qwt_polar_curve.cpp,
-	src/app/gps/qwtpolar/qwt_polar_curve.h,
-	src/app/gps/qwtpolar/qwt_polar_fitter.cpp,
-	src/app/gps/qwtpolar/qwt_polar_fitter.h,
-	src/app/gps/qwtpolar/qwt_polar_global.h,
-	src/app/gps/qwtpolar/qwt_polar_grid.cpp,
-	src/app/gps/qwtpolar/qwt_polar_grid.h,
-	src/app/gps/qwtpolar/qwt_polar_item.cpp,
-	src/app/gps/qwtpolar/qwt_polar_item.h,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.cpp,
-	src/app/gps/qwtpolar/qwt_polar_itemdict.h,
-	src/app/gps/qwtpolar/qwt_polar_layout.cpp,
-	src/app/gps/qwtpolar/qwt_polar_layout.h,
-	src/app/gps/qwtpolar/qwt_polar_magnifier.cpp,
-	src/app/gps/qwtpolar/qwt_polar_magnifier.h,
-	src/app/gps/qwtpolar/qwt_polar_marker.cpp,
-	src/app/gps/qwtpolar/qwt_polar_marker.h,
-	src/app/gps/qwtpolar/qwt_polar_panner.cpp,
-	src/app/gps/qwtpolar/qwt_polar_panner.h,
-	src/app/gps/qwtpolar/qwt_polar_plot.cpp,
-	src/app/gps/qwtpolar/qwt_polar_plot.h,
-	src/app/gps/qwtpolar/qwt_polar_point.cpp,
-	src/app/gps/qwtpolar/qwt_polar_point.h,
-	src/app/gps/qwtpolar/qwt_polar_spectrogram.cpp,
-	src/app/gps/qwtpolar/qwt_polar_spectrogram.h, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/ui/qgsgpsinformationwidgetbase.ui: Added gps
-	tracker widget. This work was sponsored by http://gonavigo.ca/. We
-	thank them for their support git-svn-id: http://svn.osgeo.org/qgis/trunk@12692
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  jef 
-
-	* src/app/composer/qgscomposertablewidget.cpp,
-	src/core/composer/qgscomposertable.h: fix windows build git-svn-id: http://svn.osgeo.org/qgis/trunk@12691
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  wonder 
-
-	* python/utils.py, src/python/qgspythonutilsimpl.cpp: Python
-	support: use a wrapper for import statement that tracks modules of
-	plugins.  This enables complete unload and reload of plugins: - qgis.utils.unloadPlugin(name) - now removes also plugin's modules
-	(files) from python - qgis.utils.reloadPlugin(name) - unloads and starts the plugin
-	again (using fresh source files) git-svn-id: http://svn.osgeo.org/qgis/trunk@12690
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  mhugent 
-
-	* src/core/composer/qgscomposermap.cpp: Emit extentChanged signal in
-	composer map after drawing to prevent concurrent layer access with
-	table items git-svn-id: http://svn.osgeo.org/qgis/trunk@12689
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  mhugent 
-
-	* src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h,
-	src/ui/qgscomposertablewidgetbase.ui: More options for composer
-	table git-svn-id: http://svn.osgeo.org/qgis/trunk@12688
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  rblazek 
-
-	* src/providers/grass/qgsgrass.cpp: temporal fix for 1900 git-svn-id: http://svn.osgeo.org/qgis/trunk@12687
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  mhugent 
-
-	* src/core/gps/qgsnmeaconnection.cpp: Replaced qWarnings with
-	QgsDebugMsg git-svn-id: http://svn.osgeo.org/qgis/trunk@12686
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  mhugent 
-
-	* src/core/CMakeLists.txt, src/core/gps/config.h,
-	src/core/gps/context.c, src/core/gps/context.h,
-	src/core/gps/gmath.c, src/core/gps/gmath.h, src/core/gps/info.c,
-	src/core/gps/info.h, src/core/gps/parse.c, src/core/gps/parse.h,
-	src/core/gps/parser.h, src/core/gps/posix_qextserialport.cpp,
-	src/core/gps/posix_qextserialport.h,
-	src/core/gps/qextserialbase.cpp, src/core/gps/qextserialbase.h,
-	src/core/gps/qextserialport.cpp, src/core/gps/qextserialport.h,
-	src/core/gps/qgsgpsconnection.cpp, src/core/gps/qgsgpsconnection.h,
-	src/core/gps/qgsgpsconnectionregistry.cpp,
-	src/core/gps/qgsgpsconnectionregistry.h,
-	src/core/gps/qgsgpstrackerthread.cpp,
-	src/core/gps/qgsgpstrackerthread.h,
-	src/core/gps/qgsnmeaconnection.cpp,
-	src/core/gps/qgsnmeaconnection.h, src/core/gps/sentence.c,
-	src/core/gps/sentence.h, src/core/gps/time.c, src/core/gps/time.h,
-	src/core/gps/tok.c, src/core/gps/tok.h, src/core/gps/units.h,
-	src/core/gps/win_qextserialport.cpp,
-	src/core/gps/win_qextserialport.h: [FEATURE]: add classes for live
-	GPS tracking in core git-svn-id: http://svn.osgeo.org/qgis/trunk@12685
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  rblazek 
-
-	* src/plugins/grass/qgsgrassmodule.cpp: pre for any module output git-svn-id: http://svn.osgeo.org/qgis/trunk@12684
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-07  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: composer attr tables
-	(r12682) git-svn-id: http://svn.osgeo.org/qgis/trunk@12683
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  mhugent 
-
-	* src/app/CMakeLists.txt, src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposer.h,
-	src/app/composer/qgscomposertablewidget.cpp,
-	src/app/composer/qgscomposertablewidget.h, src/core/CMakeLists.txt,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/composer/qgscomposeritem.h,
-	src/core/composer/qgscomposertable.cpp,
-	src/core/composer/qgscomposertable.h, src/gui/qgscomposerview.cpp,
-	src/gui/qgscomposerview.h, src/ui/qgscomposerbase.ui,
-	src/ui/qgscomposertablewidgetbase.ui: [FEATURE]: A table widget to
-	display feature attributes in the composer (but it still needs a bit
-	more settings...) git-svn-id: http://svn.osgeo.org/qgis/trunk@12682
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  rblazek 
-
-	* src/plugins/grass/qgsgrassmodule.cpp: fixed 1992, monospace font
-	for module output git-svn-id: http://svn.osgeo.org/qgis/trunk@12681
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_bg.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fr.ts, i18n/qgis_he.ts, i18n/qgis_hr_HR.ts,
-	i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts,
-	i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts,
-	i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: wohooo another language - now bulgarian - which
-	brings us to 34 languages (and the usual string update) git-svn-id: http://svn.osgeo.org/qgis/trunk@12680
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  rblazek 
-
-	* src/plugins/grass/modules-common/v.what.vect.qgm,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h: fixed #1619, and another not yet
-	reported bug for field git-svn-id: http://svn.osgeo.org/qgis/trunk@12679
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  rblazek 
-
-	* src/plugins/grass/qgsgrassedit.cpp,
-	src/providers/grass/qgsgrassprovider.cpp,
-	src/providers/grass/qgsgrassprovider.h: fix for #1169, added check
-	for isle's area git-svn-id: http://svn.osgeo.org/qgis/trunk@12678
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  rblazek 
-
-	* src/plugins/grass/modules-common/v.in.ogr.all.qgm: some options
-	marked advanced git-svn-id: http://svn.osgeo.org/qgis/trunk@12677
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-06  rblazek 
-
-	* src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp: fixed ticket #2194, icon size
-	in tab header git-svn-id: http://svn.osgeo.org/qgis/trunk@12676
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-05  macho 
-
-	* i18n/qgis_ar.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hr_HR.ts, i18n/qgis_hu.ts,
-	i18n/qgis_id.ts, i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: translation updates: hr_HR by Zoran and general
-	string update with script git-svn-id: http://svn.osgeo.org/qgis/trunk@12675
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-05  jef 
-
-	* src/app/qgsquerybuilder.cpp, src/app/qgsquerybuilder.h: fix
-	runtime warning git-svn-id: http://svn.osgeo.org/qgis/trunk@12674
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    [FEATURE] reproject layer tool for SEXTANTE
 
-2010-01-05  mhugent 
-
-	* src/app/qgisapp.cpp, src/app/qgisapp.h: Show a message box if
-	there was an error during the merge operation (instead of crashing).
-	Fixes ticket #2342 git-svn-id: http://svn.osgeo.org/qgis/trunk@12673
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-05  wonder 
-
-	* python/core/qgsrenderer.sip,
-	python/core/qgssinglesymbolrenderer.sip: PyQGIS: added missing
-	conversion to QgsRenderer subclasses, added few missing methods git-svn-id: http://svn.osgeo.org/qgis/trunk@12672
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-05  rblazek 
-
-	* src/plugins/grass/modules-common/v.out.ascii.qgm,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h: added support for advanced
-	options and example use in v.out.ascii git-svn-id: http://svn.osgeo.org/qgis/trunk@12671
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-02  mhugent 
-
-	* src/app/composer/qgscomposermapwidget.cpp: Fix double validator in
-	composer map widget (part of ticket #2252) git-svn-id: http://svn.osgeo.org/qgis/trunk@12667
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-02  jef 
-
-	* src/core/qgsvectorfilewriter.cpp: fix r12665 git-svn-id: http://svn.osgeo.org/qgis/trunk@12666
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-02  jef 
-
-	* src/app/legend/qgslegendlayer.cpp,
-	src/core/qgsvectorfilewriter.cpp, src/core/qgsvectorfilewriter.h,
-	src/core/qgsvectorlayer.cpp: catch more projection errors git-svn-id: http://svn.osgeo.org/qgis/trunk@12665
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-02  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj,
-	mac/xcode/qgis_user-template.xcconfig: context help update (r12662)
-	measure angle tool (r12663) misc cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk@12664
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-02  mhugent 
+Radim Blazek 	2012-10-11
 
-	* images/images.qrc, src/app/CMakeLists.txt, src/app/qgisapp.cpp,
-	src/app/qgisapp.h, src/app/qgsdisplayangle.cpp,
-	src/app/qgsdisplayangle.h, src/app/qgsmaptoolmeasureangle.cpp,
-	src/app/qgsmaptoolmeasureangle.h, src/app/qgsoptions.cpp,
-	src/core/qgsdistancearea.cpp, src/ui/qgsdisplayanglebase.ui,
-	src/ui/qgsoptionsbase.ui: [FEATURE]: A tool to measure angles git-svn-id: http://svn.osgeo.org/qgis/trunk@12663
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fixed #6496 - wrong GDAL exact stats
 
-2010-01-02  pcav 
-
-	* resources/context_help/QgsPgSourceSelect-it_IT,
-	resources/context_help/QgsPluginInstallerDialog-it_IT,
-	resources/context_help/QgsProjectProperties-it_IT,
-	resources/context_help/QgsScaleBarPluginGui-it_IT,
-	resources/context_help/QgsSpatiaLiteSourceSelect-it_IT,
-	resources/context_help/QgsStyleV2ManagerDialog-it_IT,
-	resources/context_help/QgsVectorLayerProperties-it_IT,
-	resources/context_help/QgsWMSSourceSelect-it_IT: Added IT context
-	help files git-svn-id: http://svn.osgeo.org/qgis/trunk@12662
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-11
 
-2010-01-02  jef 
+    debug output
 
-	* src/app/qgslabeldialog.cpp, src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.cpp, src/ui/qgslabeldialogbase.ui,
-	src/ui/qgsrasterlayerpropertiesbase.ui,
-	src/ui/qgsvectorlayerpropertiesbase.ui: allow entry of visibility
-	scales in floating point git-svn-id: http://svn.osgeo.org/qgis/trunk@12661
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2010-01-01  jef 
-
-	* src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrassmodule.h: update grass i18n git-svn-id: http://svn.osgeo.org/qgis/trunk@12660
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-11
 
-2009-12-31  jef 
+    Clean up atlas pdf generation code and fix a bug on windows
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12659
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-11
 
-2009-12-31  jef 
+    + QgsRasterBlock
 
-	* scripts/qgm2cpp.pl, scripts/ts2cpp.pl,
-	scripts/update_ts_files.sh, src/plugins/grass/qgsgrassmapcalc.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp: grass modules i18n git-svn-id: http://svn.osgeo.org/qgis/trunk@12658
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-11
 
-2009-12-31  pcav 
+    another few licenses added
 
-	* src/plugins/grass/modules-common/r.los.qgm,
-	src/plugins/grass/modules-common/r.watershed.qgm: Two typos in GRASS
-	modules git-svn-id: http://svn.osgeo.org/qgis/trunk@12657
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Nathan Woodrow 	2012-10-11
 
-2009-12-31  jef 
+    Switch to listbox for edit types. Fix #6495
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12656
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: a587cb6 936f4aa
+Nathan Woodrow 	2012-10-11
 
-2009-12-31  jef 
+    Merge pull request #287 from tecoholic/3275
+    
+    Fix for issue #3275
 
-	* python/plugins/fTools/doAbout.py,
-	python/plugins/fTools/tools/doDefineProj.py,
-	python/plugins/fTools/tools/doGeometry.py,
-	python/plugins/fTools/tools/doGeoprocessing.py,
-	python/plugins/fTools/tools/doIntersectLines.py,
-	python/plugins/fTools/tools/doJoinAttributes.py,
-	python/plugins/fTools/tools/doMeanCoords.py,
-	python/plugins/fTools/tools/doPointDistance.py,
-	python/plugins/fTools/tools/doPointsInPolygon.py,
-	python/plugins/fTools/tools/doRandPoints.py,
-	python/plugins/fTools/tools/doRandom.py,
-	python/plugins/fTools/tools/doReProject.py,
-	python/plugins/fTools/tools/doRegPoints.py,
-	python/plugins/fTools/tools/doSelectByLocation.py,
-	python/plugins/fTools/tools/doSpatialJoin.py,
-	python/plugins/fTools/tools/doSubsetSelect.py,
-	python/plugins/fTools/tools/doSumLines.py,
-	python/plugins/fTools/tools/doVectorGrid.py,
-	python/plugins/fTools/tools/doVectorSplit.py,
-	python/plugins/fTools/tools/doVisual.py: ftools i18n update git-svn-id: http://svn.osgeo.org/qgis/trunk@12655
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-11
 
-2009-12-30  pcav 
+    change symbols for selected ranges using changeBtn; retains colors
 
-	* src/plugins/grass/modules-common/v.generalize.qgm: Fixed
-	v.generalize GRASS module git-svn-id: http://svn.osgeo.org/qgis/trunk@12653
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-11
 
-2009-12-29  kyngchaos 
+    add licenses in gps directory (LGPL for NMEA Library)
 
-	* mac/xcode/ReadMe.rtf, mac/xcode/qgis_settings.xcconfig,
-	mac/xcode/qgis_user-template.xcconfig: add GSL framework option git-svn-id: http://svn.osgeo.org/qgis/trunk@12649
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-11
 
-2009-12-29  kyngchaos 
+    change symbols for selected categories; retains colors
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: postgres fix (r12641)
-	bad layer fix (r12634) attribute table fix (r12639) git-svn-id: http://svn.osgeo.org/qgis/trunk@12648
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-11
 
-2009-12-28  jef 
+    ability to delete multiple categories using Ctrl selection
 
-	* CMakeLists.txt, debian/changelog,
-	debian/libqgis{QGIS_ABI}.symbols, debian/python-qgis.symbols,
-	debian/python-qgis.symbols.in, debian/qgis-plugin-grass.symbols,
-	debian/qgis-plugin-grass.symbols.in: update version info in trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@12646
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1ff42b2 7140e52
+Magnus Homann 	2012-10-10
 
-2009-12-28  jef 
+    Merge branch 'trans_sv'
 
-	* i18n/qgis_de.ts, src/core/qgscoordinatetransform.cpp: fix compile
-	error git-svn-id: http://svn.osgeo.org/qgis/trunk@12644
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Magnus Homann 	2012-10-10
 
-2009-12-28  jef 
+    4039 översättningar
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12643
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 552703a 3c50290
+Giuseppe Sucameli 	2012-10-10
 
-2009-12-28  jef 
+    Merge pull request #284 from slarosa/master
+    
+    improvement for detection language in console_help
 
-	* python/core/qgslabel.sip, python/core/qgslabelattributes.sip,
-	src/app/qgslabeldialog.cpp, src/core/qgslabel.cpp,
-	src/core/qgslabel.h, src/core/qgslabelattributes.cpp,
-	src/core/qgslabelattributes.h, src/ui/qgslabeldialogbase.ui: apply
-	#2199 git-svn-id: http://svn.osgeo.org/qgis/trunk@12642
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-10
 
-2009-12-28  jef 
+    improvement for detection language in console_help
 
-	* src/app/qgsnewconnection.cpp, src/app/qgspgsourceselect.cpp,
-	src/providers/postgres/qgspostgresprovider.cpp: apply #2322 git-svn-id: http://svn.osgeo.org/qgis/trunk@12641
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-10
 
-2009-12-28  jef 
+    Removed pycharm project files from python tests dir
 
-	* src/core/qgscoordinatetransform.cpp: fix #2315 git-svn-id: http://svn.osgeo.org/qgis/trunk@12640
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-10
 
-2009-12-28  jef 
+    Added test and sample wkt to replicate issue 4189
 
-	* src/app/CMakeLists.txt,
-	src/app/attributetable/qgsattributetablemodel.cpp,
-	src/app/attributetable/qgsattributetablemodel.h,
-	src/app/attributetable/qgsattributetableview.cpp,
-	src/app/attributetable/qgsattributetableview.h: fix #2019 git-svn-id: http://svn.osgeo.org/qgis/trunk@12639
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 2be41ab b1ac946
+mhugent 	2012-10-10
 
-2009-12-28  timlinux 
+    Merge pull request #283 from alexbruy/datasourceuri_sip
+    
+    expose encodedUri() method in bindings
 
-	* ms-windows/QGIS-Installer.nsi: Updated version nos etc for
-	enceladus release git-svn-id: http://svn.osgeo.org/qgis/trunk@12637
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-10
 
-2009-12-28  jef 
+    expose encodedUri() method in bindings
 
-	* debian/libqgis{QGIS_ABI}.symbols: debian symbols update git-svn-id: http://svn.osgeo.org/qgis/trunk@12636
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-10
 
-2009-12-28  macho 
+    Russian help for python console
 
-	* i18n/qgis_hu.ts: translation update: hu by zoltan git-svn-id: http://svn.osgeo.org/qgis/trunk@12635
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-09
 
-2009-12-28  jef 
+    [FEATURE] Fix #6482, options for showing upside-down labels
+    
+    - Adv Labeling option to 'Show upside-down labels': never, when rotation defined, or always
+    - 'Never' (default) option is same as before, labels with 90 <= angle < 270 are turned so their text is always upright
+    - 'When rotation defined' option shows upside-down labels if their rotation is layer- or data-defined (dynamic labels are turned upright)
+    - 'Always' option shows upside-down labels at layer- or data-defined rotations and for dynamic labels
 
-	* src/gui/CMakeLists.txt, src/gui/qgsprojectbadlayerguihandler.h: 
-	fix #2328 git-svn-id: http://svn.osgeo.org/qgis/trunk@12634
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-10-09
 
-2009-12-28  pcav 
+    Fixes after rebase
 
-	* src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm,
-	src/plugins/grass/scripts/v.out.ogr.pg.py: Added an option to
-	v.out.ogr.pg - thanks Giovanni Manghi git-svn-id: http://svn.osgeo.org/qgis/trunk@12633
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-09
 
-2009-12-28  jef 
+    make Larry happy: larger icons in plugin installer
 
-	* src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.cpp,
-	src/core/symbology/qgsmarkercatalogue.cpp,
-	src/core/symbology/qgssymbol.cpp: fix #2329 git-svn-id: http://svn.osgeo.org/qgis/trunk@12632
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+D'Hont René-Luc 	2012-10-09
 
-2009-12-28  macho 
+    Set QGIS WFS Server GML valid
 
-	* i18n/qgis_hr_HR.ts: itranslation update: hr by zoran git-svn-id: http://svn.osgeo.org/qgis/trunk@12631
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-09
 
-2009-12-28  pcav 
+    refresh the canvas at the end of the process,
+    handle unicode strings,
+    escape sql ids and strings,
+    fix minor errors
 
-	* resources/context_help/QgsComposer-it_IT,
-	resources/context_help/QgsCopyrightLabelPluginGui-it_IT,
-	resources/context_help/QgsCustomProjectionDialog-it_IT,
-	resources/context_help/QgsDelimitedTextPluginGui-it_IT,
-	resources/context_help/QgsIdentifyResults-it_IT,
-	resources/context_help/QgsNewConnection-it_IT,
-	resources/context_help/QgsNorthArrowPluginGui-it_IT,
-	resources/context_help/QgsOptions-it_IT,
-	resources/context_help/eVisDatabaseConnectionGui-it_IT: Finished IT
-	translation of context help. Thanks Flavio Rigolon and Maurizio
-	Napolitano git-svn-id: http://svn.osgeo.org/qgis/trunk@12629
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1796178 cb2230e
+Giuseppe Sucameli 	2012-10-09
 
-2009-12-28  pcav 
+    Merge pull request #281 from strk/db_manager_addlayer
+    
+    dbmananger topoviewer: addlayer instead of creating a new project
 
-	* i18n/qgis_it.ts: Final edits to the IT translation? Thanks
-	Maurizio Napolitano git-svn-id: http://svn.osgeo.org/qgis/trunk@12628
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: aa25448 2581b3f
+Magnus Homann 	2012-10-09
 
-2009-12-27  wonder 
+    Merged some swedish translations
 
-	* python/core/qgsfeature.sip: Fix #2324.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12627
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-09
 
-2009-12-27  kyngchaos 
+    dbmanager: delete auto-generated files
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: sync with help app fix
-	(r12622) git-svn-id: http://svn.osgeo.org/qgis/trunk@12626
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Magnus Homann 	2012-10-09
 
-2009-12-27  jef 
+    3801 översättningar
 
-	* src/providers/grass/qgsgrass.cpp: fix #2327 git-svn-id: http://svn.osgeo.org/qgis/trunk@12625
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 6d75d20 eee37cb
+Werner Macho 	2012-10-09
 
-2009-12-27  jef 
+    Merge pull request #282 from Oslandia/i18n
+    
+    Fix some french GUI translations
 
-	* src/core/qgsapplication.cpp, src/helpviewer/CMakeLists.txt,
-	src/helpviewer/main.cpp: fix #2294 git-svn-id: http://svn.osgeo.org/qgis/trunk@12622
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-09
 
-2009-12-26  borysiasty 
+    core raster files moved to core/raster
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py: plugin
-	installer update - fix #2247 git-svn-id: http://svn.osgeo.org/qgis/trunk@12621
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-09
 
-2009-12-26  macho 
+    Fix some FR translations: use "emprise" rather than "étendue"
 
-	* i18n/qgis_fr.ts: translation update: fr by jean roc git-svn-id: http://svn.osgeo.org/qgis/trunk@12620
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Radim Blazek 	2012-10-09
 
-2009-12-25  mhugent 
+    QgsMalloc, QgsCalloc, QgsFree
 
-	* src/core/composer/qgscomposerscalebar.cpp: Fix for scalebar not
-	responding to map changes after reading from project file and
-	template git-svn-id: http://svn.osgeo.org/qgis/trunk@12619
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-09
 
-2009-12-24  kyngchaos 
+    Fix cleanup of map composition. Fixes ticket #6440
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help updates
-	(r12611, r12613) git-svn-id: http://svn.osgeo.org/qgis/trunk@12618
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-09
 
-2009-12-24  jef 
+    translation update: sv by Victor
 
-	* src/core/qgsdistancearea.cpp, src/core/qgsgeometry.cpp: don't
-	measure empty geometries and also return success when exports geos
-	points to wkb git-svn-id: http://svn.osgeo.org/qgis/trunk@12617
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f4dd8a0 eae008e
+Marco Hugentobler 	2012-10-09
 
-2009-12-24  jef 
+    QGIS server: merge get_project_settings branch
 
-	* src/core/qgsapplication.cpp, src/core/qgscsexception.h,
-	src/core/qgsexception.h,
-	src/plugins/diagram_overlay/qgsbardiagramfactory.cpp,
-	src/plugins/diagram_overlay/qgsdiagramfactory.cpp,
-	src/plugins/diagram_overlay/qgsdiagramoverlay.cpp,
-	src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp: use QString in
-	QgsException to fix encoding git-svn-id: http://svn.osgeo.org/qgis/trunk@12616
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-08
 
-2009-12-24  jef 
+    Install style templates
 
-	* src/core/qgsvectorlayer.cpp: catch projection exceptions while V2
-	rendering git-svn-id: http://svn.osgeo.org/qgis/trunk@12615
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: dc522e0 a28157c
+Giuseppe Sucameli 	2012-10-08
 
-2009-12-24  pcav 
+    Merge pull request #277 from slarosa/master
+    
+    add key event (del) to prevent removing of the prompt when selected,
+    rename helpConsole to console_help
 
-	* resources/context_help/QgsAttributeTableDialog-it_IT,
-	resources/context_help/QgsBookmarks-it_IT,
-	resources/context_help/QgsComposer-it_IT,
-	resources/context_help/QgsCopyrightLabelPluginGui-it_IT,
-	resources/context_help/QgsCustomProjectionDialog-it_IT,
-	resources/context_help/QgsDelimitedTextPluginGui-it_IT,
-	resources/context_help/QgsGPSPluginGui-it_IT,
-	resources/context_help/QgsIdentifyResults-it_IT,
-	resources/context_help/QgsNewConnection-it_IT,
-	resources/context_help/QgsNewOgrConnection-it_IT,
-	resources/context_help/QgsNewVectorLayerDialog-it_IT,
-	resources/context_help/QgsNorthArrowPluginGui-it_IT,
-	resources/context_help/QgsOpenVectorLayerDialog-it_IT,
-	resources/context_help/QgsOptions-it_IT: More IT translations of
-	context_help by Flavio Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@12613
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-08
 
-2009-12-24  mhugent 
+    Keep composition in GetCapabilities to keep compatibility with older versions
 
-	* src/app/composer/qgscomposer.cpp, src/app/composer/qgscomposer.h: 
-	Don't read composer title from template. Fixes bug #2311 git-svn-id: http://svn.osgeo.org/qgis/trunk@12612
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-07-21
 
-2009-12-24  pcav 
+    [API] added QgsFeatureIterator, changed QgsVectorProvider API
+    
+    Vector data provider now has getFeatures() method to access features.
+    select(), nextFeature(), featureAtId(), rewind() were removed resp. moved to provider's feature iterator implementations.
+    
+    Providers that currently do not implement the new API were disabled.
 
-	* debian/control, resources/context_help/MapServerExport-it_IT,
-	resources/context_help/QgsMeasureDialog-it_IT,
-	resources/context_help/eVisDatabaseConnectionGui-it_IT: First IT
-	translations of context_help by Flavio Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@12611
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-24  pcav 
-
-	* i18n/qgis_it.ts: More IT translation improvements - will we ever
-	finish? git-svn-id: http://svn.osgeo.org/qgis/trunk@12610
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-24  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: various updates (r12579,
-	r12581, r12590, r12600) git-svn-id: http://svn.osgeo.org/qgis/trunk@12609
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-24  jef 
-
-	* src/helpviewer/CMakeLists.txt: revert inadvertently committed
-	change git-svn-id: http://svn.osgeo.org/qgis/trunk@12608
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/core/qgis.h: fix #2164 git-svn-id: http://svn.osgeo.org/qgis/trunk@12607
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/qgsmaptooladdfeature.cpp: fix #2239 git-svn-id: http://svn.osgeo.org/qgis/trunk@12606
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12605
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/qgisapp.cpp: fix #2293 git-svn-id: http://svn.osgeo.org/qgis/trunk@12604
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/qgsmaptoolidentify.cpp, src/app/qgsoptions.cpp: fix #2264 git-svn-id: http://svn.osgeo.org/qgis/trunk@12603
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/qgsgraduatedsymboldialog.cpp,
-	src/app/qgsuniquevaluedialog.cpp: fix #2318 git-svn-id: http://svn.osgeo.org/qgis/trunk@12602
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/analysis/interpolation/Vector3D.h,
-	src/app/composer/qgscomposer.cpp,
-	src/app/composer/qgscomposerpicturewidget.cpp, src/app/main.cpp,
-	src/app/qgisappinterface.cpp,
-	src/core/raster/qgsrastertransparency.cpp,
-	src/core/renderer/qgsuniquevaluerenderer.h,
-	src/helpviewer/main.cpp, src/helpviewer/qgshelpviewer.cpp,
-	src/plugins/gps_importer/qgsbabelformat.cpp,
-	src/plugins/gps_importer/qgsgpsdevice.cpp,
-	src/plugins/gps_importer/qgsgpsplugin.cpp,
-	src/providers/gpx/qgsgpxprovider.cpp,
-	tests/src/core/testqgsmaprenderer.cpp,
-	tests/src/core/testqgsvectorfilewriter.cpp: automatic indentation
-	update (r12177-r12600) git-svn-id: http://svn.osgeo.org/qgis/trunk@12601
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* ChangeLog, INSTALL, doc/INSTALL.t2t,
-	python/core/qgsrasterlayer.sip, python/core/qgsrenderer.sip,
-	python/gui/qgsmapcanvas.sip, python/plugins/osm/OsmUploadDlg.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	resources/context_help/QgsPluginInstallerDialog-en_US,
-	resources/context_help/QgsVectorLayerProperties-en_US,
-	scripts/chkspelling.sh, scripts/prepare-commit.sh,
-	scripts/spelling.dat,
-	src/analysis/interpolation/DualEdgeTriangulation.h,
-	src/app/qgisapp.cpp, src/app/qgsoptions.cpp, src/app/qgsoptions.h,
-	src/app/qgsprojectproperties.cpp, src/app/qgsprojectproperties.h,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.h, src/core/qgsapplication.cpp,
-	src/core/qgsattributeaction.h, src/core/qgsrunprocess.cpp,
-	src/core/qgssearchstringparser.yy,
-	src/core/raster/qgsfreakoutshader.cpp,
-	src/core/raster/qgslinearminmaxenhancement.h,
-	src/core/raster/qgspseudocolorshader.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/renderer/qgscontinuouscolorrenderer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsrenderer.h,
-	src/core/renderer/qgsuniquevaluerenderer.cpp,
-	src/core/spatialite/sqlite3.c, src/core/symbology/qgssymbol.cpp,
-	src/designer/README.txt, src/gui/qgsprojectionselector.cpp,
-	src/gui/qgsquickprint.cpp, src/gui/qgsquickprint.h,
-	src/helpviewer/CMakeLists.txt,
-	src/plugins/copyright_label/plugin.cpp,
-	src/plugins/copyright_label/plugin.h,
-	src/plugins/copyright_label/pluginguibase.ui.h,
-	src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h,
-	src/plugins/grass/qgsgrassedit.h,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qtermwidget/CharacterColor.h,
-	src/plugins/grass/qtermwidget/Screen.h,
-	src/plugins/grass/qtermwidget/Session.cpp,
-	src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp,
-	src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h,
-	src/plugins/grass/qtermwidget/TerminalDisplay.cpp,
-	src/plugins/north_arrow/pluginguibase.ui.h,
-	src/plugins/scale_bar/plugin.cpp, src/plugins/scale_bar/plugin.h,
-	src/plugins/scale_bar/plugingui.cpp,
-	src/plugins/scale_bar/plugingui.h,
-	src/plugins/scale_bar/pluginguibase.ui,
-	src/plugins/scale_bar/pluginguibase.ui.h, src/ui/qgsoptionsbase.ui,
-	src/ui/qgsprojectpropertiesbase.ui,
-	tests/src/core/testqgsgeometry.cpp: another round of typo fixes (and
-	use color instead of colour - like Qt; no string updates) git-svn-id: http://svn.osgeo.org/qgis/trunk@12600
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  wonder 
-
-	* src/app/qgsmaptoolnodetool.cpp: Refresh canvas after adding a new
-	node (#2313) git-svn-id: http://svn.osgeo.org/qgis/trunk@12599
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  wonder 
-
-	* python/plugins/osm/OsmFeatureDW.py,
-	python/plugins/osm/map_tools/OsmCreateLineMT.py,
-	python/plugins/osm/map_tools/OsmCreatePointMT.py,
-	python/plugins/osm/map_tools/OsmCreatePolygonMT.py,
-	python/plugins/osm/map_tools/OsmMoveMT.py: Use fixed 2px pen width
-	for rubber bands and vertex markers. (The previous default 10px was
-	just too much) git-svn-id: http://svn.osgeo.org/qgis/trunk@12598
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  wonder 
-
-	* python/core/qgsfeature.sip: Leave only one setGeometry method to
-	avoid ambiguous behaviour, added missing /Transfer/ annotation.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12597
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  mhugent 
-
-	* src/ui/qgscomposermanagerbase.ui: Switch position of add and show
-	button in composer manager git-svn-id: http://svn.osgeo.org/qgis/trunk@12596
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  mhugent 
-
-	* src/core/qgsgeometry.cpp: Reduce precision for point on line test.
-	Fixes bug #2224 git-svn-id: http://svn.osgeo.org/qgis/trunk@12595
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp: 
-	followup r12593 git-svn-id: http://svn.osgeo.org/qgis/trunk@12594
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/legend/qgslegend.cpp, src/app/legend/qgslegendlayer.cpp: 
-	fix #2314 git-svn-id: http://svn.osgeo.org/qgis/trunk@12593
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  jef 
-
-	* src/app/qgsmaptoolidentify.cpp: fix #2317 git-svn-id: http://svn.osgeo.org/qgis/trunk@12592
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  wonder 
-
-	* src/providers/osm/osmprovider.cpp: Reuse OSM db file on windows.
-	For some strange reason it was not considering the same QDateTime to
-	be equal.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12591
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  wonder 
-
-	* python/plugins/osm/OsmFeatureDW.py, python/plugins/osm/OsmTags.py: 
-	moved suggested osm tag keys and values to another file git-svn-id: http://svn.osgeo.org/qgis/trunk@12590
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-23  macho 
-
-	* i18n/qgis_is.ts: translation update: is by thordur git-svn-id: http://svn.osgeo.org/qgis/trunk@12589
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-22  jef 
-
-	* resources/context_help/MapServerExport-de_DE,
-	resources/context_help/MapServerExport-en_US,
-	resources/context_help/QgsAttributeTableDialog-de_DE,
-	resources/context_help/QgsAttributeTableDialog-en_US,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-en_US,
-	resources/context_help/QgsScaleBarPluginGui-en_US,
-	resources/context_help/QgsSpatiaLiteSourceSelect-de_DE,
-	resources/context_help/QgsVectorLayerProperties-de_DE,
-	resources/context_help/QgsVectorLayerProperties-en_US: context help
-	fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@12588
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 13a6fd9 c0e779f
+mhugent 	2012-10-08
 
-2009-12-22  jef 
+    Merge pull request #280 from Oslandia/atlas
+    
+    Fix a bug in atlas generation GUI.
 
-	* src/app/legend/qgslegendlayer.cpp: show classification attribute
-	above the classes in legend git-svn-id: http://svn.osgeo.org/qgis/trunk@12587
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-06-26
 
-2009-12-22  jef 
+    Further tweaks to QgsFeatureRequest API, support featureAtId
 
-	* src/app/legend/qgslegend.cpp: fix #2312 git-svn-id: http://svn.osgeo.org/qgis/trunk@12586
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-05-13
 
-2009-12-22  mhugent 
+    Allow access to feature attributes by name
 
-	* src/core/qgsgeometry.cpp: Test if polygon rings are still inside
-	the outer boundary after reshape and fix a memory leak. Fixes bug
-	#2220 git-svn-id: http://svn.osgeo.org/qgis/trunk@12585
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Martin Dobias 	2012-05-12
 
-2009-12-22  jef 
+    Added select() variant with QgsFeatureRequest for simpler construction of requests
 
-	* src/app/qgisapp.cpp: fix connect git-svn-id: http://svn.osgeo.org/qgis/trunk@12584
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-08
 
-2009-12-22  kyngchaos 
+    Fix a bug in atlas generation GUI.
+    The 'print' and 'exportAsImages' actions were generating atlas even when not enabled
 
-	* src/core/qgsapplication.cpp: Mac app/window icon from resource,
-	not xpm git-svn-id: http://svn.osgeo.org/qgis/trunk@12583
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Larry Shaffer 	2012-10-08
 
-2009-12-22  jef 
+    Fix for older compilers, like on stock Mac OS X
 
-	* src/app/qgslabeldialog.cpp, src/ui/qgslabeldialogbase.ui: fix
-	offset labels in label dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12582
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Sandro Santilli 	2012-10-08
 
-2009-12-22  macho 
+    Add topoview layers to existing project
 
-	* resources/context_help/QgsAttributeTable-pt_BR,
-	resources/context_help/QgsBookmarks-pt_BR,
-	resources/context_help/QgsComposer-pt_BR,
-	resources/context_help/QgsCopyrightLabelPluginGui-pt_BR,
-	resources/context_help/QgsCreateNewVectorLayer-pt_BR,
-	resources/context_help/QgsDbSourceSelect-pt_BR,
-	resources/context_help/QgsDelimitedTextPluginGui-pt_BR,
-	resources/context_help/QgsGPSPlugin-pt_BR,
-	resources/context_help/QgsIdentifyResults-pt_BR,
-	resources/context_help/QgsMapserverExport-pt_BR,
-	resources/context_help/QgsMeasure-pt_BR,
-	resources/context_help/QgsNewConnection-pt_BR,
-	resources/context_help/QgsNewHttpConnection-pt_BR,
-	resources/context_help/QgsNewOgrConnection-pt_BR,
-	resources/context_help/QgsOpenVectorLayerDialog-pt_BR,
-	resources/context_help/QgsProjectProperties-pt_BR,
-	resources/context_help/QgsServerSourceSelect-pt_BR,
-	resources/context_help/QgsVectorLayerProperties-pt_BR: adding pt_BR
-	context help translation by Arthur Nanni git-svn-id: http://svn.osgeo.org/qgis/trunk@12581
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-08
 
-2009-12-22  jef 
+    translation update: es by Diana
 
-	* src/providers/delimitedtext/qgsdelimitedtextprovider.cpp,
-	src/providers/delimitedtext/qgsdelimitedtextprovider.h: fix #2208 git-svn-id: http://svn.osgeo.org/qgis/trunk@12580
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 3f412e4 6c652a0
+mhugent 	2012-10-08
 
-2009-12-22  wonder 
+    Merge pull request #278 from Oslandia/atlas
+    
+    Fix atlas parameter loading when loading from a template composer
 
-	* python/core/core.sip, python/core/qgssearchstring.sip,
-	python/core/qgssearchtreenode.sip, src/core/qgssearchtreenode.h: 
-	Added python bindings for search strings git-svn-id: http://svn.osgeo.org/qgis/trunk@12579
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-22  wonder 
+Alexander Bruy 	2012-10-08
 
-	* src/core/qgssearchstringparser.yy: Fixed operator precedence
-	(#2308) git-svn-id: http://svn.osgeo.org/qgis/trunk@12578
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-22  jef 
+    yet another fix for plugin installer
 
-	* src/app/qgsnewvectorlayerdialog.cpp,
-	src/providers/ogr/qgsogrprovider.cpp: fix #2299 git-svn-id: http://svn.osgeo.org/qgis/trunk@12577
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-22  jef 
-
-	* debian/libqgis{QGIS_ABI}.symbols, debian/python-qgis.symbols: 
-	debian symbols update git-svn-id: http://svn.osgeo.org/qgis/trunk@12575
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-22  jef 
-
-	* src/core/pal/rtree.hpp: fix warning git-svn-id: http://svn.osgeo.org/qgis/trunk@12574
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-08
 
-2009-12-22  jef 
+    Atlas gui: use coverge map's name rather than its id
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12573
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-08
 
-2009-12-22  pcav 
+    Fix some FR translations: s/caneva/canevas/
 
-	* i18n/qgis_it.ts: More improvements in the IT translation - Thanks
-	Flavio Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@12572
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-08
 
-2009-12-22  macho 
+    fix plugins installation
 
-	* i18n/qgis_de.ts, i18n/qgis_tr.ts: translation updates: tr by Osman
-	Yilmaz git-svn-id: http://svn.osgeo.org/qgis/trunk@12571
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-08
 
-2009-12-22  ersts 
+    Fix atlas parameter loading when loading from a template composer
 
-	* src/core/raster/qgsrasterlayer.cpp: -fixed nodata bug when
-	calculating min/max from current extent -Closes ticket #2309 git-svn-id: http://svn.osgeo.org/qgis/trunk@12570
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-08
 
-2009-12-21  macho 
+    another copyright update
 
-	* i18n/qgis_hu.ts, i18n/qgis_is.ts: translation update: is by
-	thordur and hu by siki git-svn-id: http://svn.osgeo.org/qgis/trunk@12569
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Pirmin Kalberer 	2012-10-07
 
-2009-12-21  kyngchaos 
+    CMake variable for additional plugins to build (Usage: ccmake .. -DCUSTOM_PLUGINS:STRING=myplugin)
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help updates
-	(r12554, r12567) preserve symbology settings (r12563) git-svn-id: http://svn.osgeo.org/qgis/trunk@12568
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 53fb95c fccf9ac
+Pirmin Kalberer 	2012-10-07
 
-2009-12-21  jef 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* resources/context_help/MapServerExport-de_DE,
-	resources/context_help/QgsBookmarks-de_DE,
-	resources/context_help/QgsComposer-de_DE,
-	resources/context_help/QgsCopyrightLabelPluginGui-de_DE,
-	resources/context_help/QgsCustomProjectionDialog-de_DE,
-	resources/context_help/QgsCustomProjectionDialog-en_US,
-	resources/context_help/QgsDelimitedTextPluginGui-de_DE,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNorthArrowPluginGui-de_DE,
-	resources/context_help/QgsNorthArrowPluginGui-en_US,
-	resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsPgSourceSelect-de_DE,
-	resources/context_help/QgsPluginInstallerDialog-de_DE,
-	resources/context_help/QgsProjectProperties-de_DE,
-	resources/context_help/QgsScaleBarPluginGui-de_DE,
-	resources/context_help/QgsScaleBarPluginGui-en_US,
-	resources/context_help/QgsScaleBarPluginGui-pl_PL,
-	resources/context_help/QgsServerSourceSelect-de_DE,
-	resources/context_help/QgsServerSourceSelect-en_US,
-	resources/context_help/QgsServerSourceSelect-ru_RU,
-	resources/context_help/QgsServerSourceSelect-sk_SK,
-	resources/context_help/QgsServerSourceSelect-sv_SE,
-	resources/context_help/QgsSpatiaLiteSourceSelect-de_DE,
-	resources/context_help/QgsStyleV2ManagerDialog-de_DE,
-	resources/context_help/QgsVectorLayerProperties-de_DE,
-	resources/context_help/QgsVectorLayerProperties-en_US,
-	resources/context_help/eVisDatabaseConnectionGui-de_DE: context help
-	update git-svn-id: http://svn.osgeo.org/qgis/trunk@12567
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Pirmin Kalberer 	2012-10-07
 
-2009-12-21  pcav 
+    Reuse closed globe window
 
-	* i18n/qgis_it.ts: More typo in the IT translation - Thanks Flavio
-	Rigolon git-svn-id: http://svn.osgeo.org/qgis/trunk@12566
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-07
 
-2009-12-21  ersts 
+    mark experimental plugins in installer (fix #5980)
 
-	* src/plugins/evis/ui/evisgenericeventbrowserguibase.ui: -Fixed
-	layout bug in the eVis event browser and tidied up the options tab,
-	no strings added or deleted -Closes ticket 2215 git-svn-id: http://svn.osgeo.org/qgis/trunk@12564
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-07
 
-2009-12-21  wonder 
+    doxygen update:
+    - include core/diagram and gui/symbology-ng
+    - enable dynamic sections
 
-	* python/core/symbology-ng-core.sip,
-	src/app/qgsvectorlayerproperties.cpp, src/core/CMakeLists.txt,
-	src/core/symbology-ng/qgssymbologyv2conversion.cpp,
-	src/core/symbology-ng/qgssymbologyv2conversion.h: Preserve as many
-	settings as possible when converting between new and old symbology.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12563
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-07
 
-2009-12-21  macho 
+    minor fixes and changes
+    - rename helpConsole to console_help
+    - add key event (del) to prevent removing of the prompt when selected
 
-	* i18n/qgis_es.ts: one string missing - forgot to update the strings git-svn-id: http://svn.osgeo.org/qgis/trunk@12562
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-07
 
-2009-12-21  macho 
+    move 'open recent project' above separator
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@12561
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-07
 
-2009-12-21  pcav 
+    auto updating of categorized rendrer symbols
 
-	* i18n/qgis_it.ts: Minor IT translation improvements git-svn-id: http://svn.osgeo.org/qgis/trunk@12560
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-07
 
-2009-12-21  borysiasty 
+    fixed the change symbol button bug in graduated renderer
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12559
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-07
 
-2009-12-20  wonder 
+    python console: fix key events and text selection,
+    do not allow to move cursor out of the edition zone (except for selection),
+    cleanup (remove unused functions and vars)
 
-	* src/app/qgsoptions.cpp, src/core/qgsvectorlayer.cpp: Use cross by
-	default as editing vertex marker: semi-transparent circle markers
-	take way too long time to render.  Also make the markers smaller by
-	default for better readability.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12558
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-07
 
-2009-12-20  jef 
+    make the python console working as standalone application (useful for testing)
 
-	* i18n/qgis_de.ts, resources/context_help/QgsComposer-de_DE,
-	resources/context_help/QgsCopyrightLabelPluginGui-de_DE,
-	resources/context_help/QgsOptions-de_DE: fix german translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12557
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-06
 
-2009-12-20  jef 
+    align metadata names between __init__.py and metadata.txt:
+    
+    deprecate authorName function in __init__ (but kept for compatibility), use author function instead
 
-	* src/app/qgisapp.cpp: automatically append missing .shp to created
-	shapefiles git-svn-id: http://svn.osgeo.org/qgis/trunk@12556
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Giuseppe Sucameli 	2012-10-06
 
-2009-12-20  jef 
+    display selected feature count in attribute table when docked,
+    do not select rows two times when the attribute table view is created
 
-	* src/app/attributetable/qgsattributetablemodel.cpp: fix #1773 git-svn-id: http://svn.osgeo.org/qgis/trunk@12555
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 52de721 42672c1
+Giuseppe Sucameli 	2012-10-06
 
-2009-12-20  borysiasty 
+    Merge pull request #275 from slarosa/master
+    
+    fix mouse event in python console,
+    update italian translation
 
-	* resources/context_help/QgsScaleBarPluginGui-en_US,
-	resources/context_help/QgsScaleBarPluginGui-pl_PL,
-	resources/context_help/QgsSpatiaLiteSourceSelect-pl_PL: context help
-	update from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12554
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-07
 
-2009-12-20  borysiasty 
+    update Italian translation
 
-	* i18n/qgis_pl_PL.ts: translation update: pl by Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@12553
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-07
 
-2009-12-20  wonder 
+    fixed typo in script and licenseadd
 
-	* python/utils.py, src/app/qgspluginmetadata.cpp,
-	src/app/qgspluginmetadata.h, src/app/qgspluginregistry.cpp,
-	src/python/qgspythonutils.h, src/python/qgspythonutilsimpl.cpp,
-	src/python/qgspythonutilsimpl.h: Manage python plugins loaded state
-	in python utils.py module.  This allows seamless loading/unloading
-	of plugins by plugin installer.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12552
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-06
 
-2009-12-20  mhugent 
+    another fix to mouse event:
+    - prevents paste text if cursor is not in edition zone
 
-	* src/app/qgsfieldcalculator.cpp: more bugfixing in field calculator git-svn-id: http://svn.osgeo.org/qgis/trunk@12551
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-06
 
-2009-12-20  jef 
+    translatoin update; nl by Raymond
 
-	* src/core/qgscoordinatetransform.cpp: fix garbled exceptions on
-	proj errors git-svn-id: http://svn.osgeo.org/qgis/trunk@12550
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-10-06
 
-2009-12-20  macho 
+    fixed change symbol button bug in categorized renderer
 
-	* i18n/qgis_lv.ts: translation update: lv by Maris .. more and more
-	translations come in time - this will be a great release git-svn-id: http://svn.osgeo.org/qgis/trunk@12549
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-06
 
-2009-12-20  pcav 
+    [FEATURE] open layer properties from identify results
 
-	* i18n/qgis_it.ts: Minor edits to the IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12548
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 9f0d858 5d84cd3
+mhugent 	2012-10-06
 
-2009-12-20  kyngchaos 
+    Merge pull request #276 from cmoe/bug_snapping_options
+    
+    tried to fix problem with snapping options on adding a new layer to the ...
 
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: context help updates
-	(r12530, r12539); misc updates git-svn-id: http://svn.osgeo.org/qgis/trunk@12547
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+cmoe 	2012-10-06
 
-2009-12-20  jef 
+    tried to fix problem with snapping options on adding a new layer to the project
 
-	* resources/context_help/QgsWMSSourceSelect-de_DE,
-	scripts/chkspelling.sh, scripts/spelling.dat,
-	src/analysis/vector/qgsgeometryanalyzer.cpp,
-	src/core/composer/qgscomposerarrow.cpp,
-	src/providers/grass/qgsgrassprovider.cpp: missed some warnings and
-	other minor updates git-svn-id: http://svn.osgeo.org/qgis/trunk@12546
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-06
 
-2009-12-20  jef 
+    fix mouse event in console
 
-	* src/app/attributetable/qgsattributetabledelegate.cpp,
-	src/app/attributetable/qgsattributetabledelegate.h,
-	src/app/qgsattributeeditor.cpp, src/app/qgsattributetypedialog.cpp: 
-	attribute editor fixes: - in attribute table: set minimum width of editor to columns width
-	  and height of filename widget to two times the lineedit height - fix non-editable unique value editor (was editable) - fix enum support - add support for symbology-ng categories git-svn-id: http://svn.osgeo.org/qgis/trunk@12545
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 0d4b6f6 9135226
+mhugent 	2012-10-06
 
-2009-12-20  jef 
+    Merge pull request #274 from Oslandia/atlas_integration
+    
+    Add access to the atlas layer in the expression builder GUI for labels.
 
-	* src/app/legend/qgslegendlayer.cpp,
-	src/core/qgsvectorfilewriter.cpp: make
-	QgsVectorLayer::deleteShapefile case-agnostic git-svn-id: http://svn.osgeo.org/qgis/trunk@12544
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-06
 
-2009-12-20  mhugent 
+    Fix composer scalebar test
 
-	* src/app/qgsfieldcalculator.cpp: Fix bug that prevented attribute
-	table to update correctly after field calculator usage git-svn-id: http://svn.osgeo.org/qgis/trunk@12543
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-06
 
-2009-12-20  macho 
+    Fix composerhtml tests
 
-	* TRANSLATORS, i18n/qgis_de.ts, i18n/qgis_hr_HR.ts: translation
-	update frozen strings and new language croatian git-svn-id: http://svn.osgeo.org/qgis/trunk@12542
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Alexander Bruy 	2012-10-06
 
-2009-12-20  jef 
-
-	* CMakeLists.txt, src/analysis/interpolation/NormVecDecorator.cc,
-	src/analysis/vector/qgsgeometryanalyzer.cpp,
-	src/core/pal/layer.cpp, src/core/raster/qgsrastertransparency.cpp: 
-	fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@12541
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  wonder 
-
-	* python/core/qgsmaprenderer.sip, src/core/qgsmaprenderer.cpp,
-	src/core/qgsmaprenderer.h, src/plugins/labeling/pallabeling.cpp,
-	src/plugins/labeling/pallabeling.h: Fix new labeling to work with
-	render caching.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12540
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  jef 
-
-	* i18n/qgis_de.ts, resources/context_help/MapServerExport-de_DE,
-	resources/context_help/MapServerExport-en_US,
-	resources/context_help/QgsMapserverExport-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOptions-de_DE,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsSpatiaLiteSourceSelect-de_DE,
-	resources/context_help/QgsSpatiaLiteSourceSelect-en_US,
-	resources/context_help/QgsWMSSourceSelect-de_DE: german translation
-	update, some context help fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@12539
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  macho 
-
-	* i18n/qgis_ja.ts: translation update: ja by Yoichi git-svn-id: http://svn.osgeo.org/qgis/trunk@12538
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  wonder 
-
-	* python/core/qgsvectorlayer.sip,
-	python/core/symbology-ng-core.sip, src/core/qgsvectorlayer.cpp,
-	src/core/qgsvectorlayer.h, src/core/symbology-ng/qgsrendererv2.cpp,
-	src/core/symbology-ng/qgsrendererv2.h: Show editing vertex markers
-	with symbology-ng. Fixes #2171.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12537
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  jef 
-
-	* src/helpviewer/CMakeLists.txt, src/helpviewer/main.cpp,
-	src/helpviewer/qgshelpviewer.cpp: respect overriden locale in
-	helpviewer and fix link typo git-svn-id: http://svn.osgeo.org/qgis/trunk@12536
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12531
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  borysiasty 
-
-	* resources/context_help/QgsGPSPluginGui-en_US,
-	resources/context_help/QgsIdentifyResults-de_DE,
-	resources/context_help/QgsIdentifyResults-en_US,
-	resources/context_help/QgsIdentifyResults-es_ES,
-	resources/context_help/QgsIdentifyResults-pl_PL,
-	resources/context_help/QgsIdentifyResults-sk_SK,
-	resources/context_help/QgsIdentifyResults-sv_SE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsPluginInstallerDialog-pl_PL,
-	resources/context_help/QgsSpatiaLiteSourceSelect-en_US,
-	resources/context_help/QgsWMSSourceSelect-en_US: Context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12530
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  jef 
-
-	* debian/libqgis{QGIS_ABI}.symbols,
-	debian/qgis-plugin-grass.symbols: debian symbols update git-svn-id: http://svn.osgeo.org/qgis/trunk@12529
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  jef 
-
-	* BUGS, CODING, COPYING, ChangeLog, INSTALL, README,
-	debian/changelog, doc/CODING.t2t, doc/INSTALL.t2t, doc/index.html,
-	ms-windows/Installer-Files/LICENSE.txt,
-	python/core/qgscoordinatereferencesystem.sip,
-	python/core/qgsgeometry.sip,
-	python/core/qgsgraduatedsymbolrenderer.sip,
-	python/core/qgssnapper.sip, python/core/qgsvectorlayer.sip,
-	python/gui/qgsencodingfiledialog.sip,
-	python/gui/qgsgenericprojectionselector.sip,
-	python/gui/qgsmapcanvassnapper.sip, python/gui/qgsrubberband.sip,
-	python/plugins/mapserver_export/ms_export.py,
-	python/plugins/osm/OsmDownloadDlg.py,
-	python/plugins/osm/OsmFeatureDW.py,
-	python/plugins/osm/OsmImportDlg.py,
-	python/plugins/osm/OsmLoadDlg.py, python/plugins/osm/OsmSaveDlg.py,
-	python/plugins/osm/OsmUploadDlg.py,
-	python/plugins/osm/map_tools/OsmCreateLineMT.py,
-	python/plugins/osm/map_tools/OsmCreatePolygonMT.py,
-	scripts/chkspelling.sh, scripts/spelling.dat,
-	src/analysis/interpolation/DualEdgeTriangulation.cc,
-	src/analysis/interpolation/DualEdgeTriangulation.h,
-	src/analysis/interpolation/MathUtils.h,
-	src/analysis/interpolation/Vector3D.h, src/app/CMakeLists.txt,
-	src/app/attributetable/qgsattributetabledialog.h,
-	src/app/composer/qgscomposer.cpp, src/app/legend/qgslegend.h,
-	src/app/qgisapp.cpp, src/app/qgsidentifyresults.cpp,
-	src/app/qgsmaptooledit.h, src/app/qgsmaptoolnodetool.h,
-	src/app/qgsrasterlayerproperties.cpp,
-	src/app/qgsvectorlayerproperties.cpp,
-	src/core/composer/qgscomposeritem.cpp,
-	src/core/pal/labelposition.h, src/core/pal/problem.h,
-	src/core/pal/rtree.hpp, src/core/pal/simplemutex.h,
-	src/core/qgsapplication.h, src/core/qgscoordinatereferencesystem.h,
-	src/core/qgscoordinatetransform.cpp, src/core/qgsgeometry.h,
-	src/core/qgslabel.cpp, src/core/qgsmaplayer.cpp,
-	src/core/qgsproject.cpp, src/core/qgssearchstring.h,
-	src/core/qgssearchstringparser.yy, src/core/qgssnapper.h,
-	src/core/qgsvectorlayer.cpp, src/core/qgsvectorlayer.h,
-	src/core/raster/qgscolorrampshader.cpp,
-	src/core/raster/qgsrasterlayer.cpp,
-	src/core/raster/qgsrasterlayer.h,
-	src/core/raster/qgsrastertransparency.cpp,
-	src/core/renderer/qgscontinuouscolorrenderer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.cpp,
-	src/core/renderer/qgsgraduatedsymbolrenderer.h,
-	src/core/renderer/qgsuniquevaluerenderer.cpp,
-	src/core/spatialite/headers/spatialite/gaiageo.h,
-	src/core/spatialite/headers/spatialite/sqlite3.h,
-	src/core/spatialite/headers/spatialite/sqlite3ext.h,
-	src/core/spatialite/spatialite.c, src/core/spatialite/sqlite3.c,
-	src/core/symbology/qgssymbol.cpp, src/gui/qgisgui.cpp,
-	src/gui/qgsdetaileditemdelegate.cpp,
-	src/gui/qgsencodingfiledialog.h,
-	src/gui/qgsgenericprojectionselector.cpp,
-	src/gui/qgsmapcanvassnapper.h,
-	src/gui/qgsprojectbadlayerguihandler.cpp,
-	src/gui/qgsprojectionselector.cpp, src/gui/qgsrubberband.h,
-	src/plugins/dxf2shp_converter/shapelib-1.2.10/dbfopen.c,
-	src/plugins/grass/qgsgrassedit.cpp,
-	src/plugins/grass/qgsgrassmodule.cpp,
-	src/plugins/grass/qgsgrasstools.cpp,
-	src/plugins/grass/qtermwidget/KeyboardTranslator.h,
-	src/plugins/grass/qtermwidget/Screen.h,
-	src/plugins/grass/qtermwidget/kb-layouts/linux.keytab,
-	src/plugins/grass/qtermwidget/kb-layouts/vt420pc.keytab,
-	src/plugins/grass/qtermwidget/qtermwidget.h,
-	src/plugins/plugin_builder.py,
-	src/plugins/quick_print/quickprintgui.cpp,
-	src/providers/grass/qgsgrass.cpp,
-	src/providers/osm/osmprovider.cpp,
-	src/providers/wms/qgswmsprovider.h,
-	tests/algorithms/projections/projectioncshandlingtest.h,
-	tests/src/core/regression1141.cpp,
-	tests/src/core/testqgsmaprenderer.cpp,
-	tests/src/core/testqgsvectorfilewriter.cpp: fix common typos git-svn-id: http://svn.osgeo.org/qgis/trunk@12528
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  macho 
-
-	* i18n/qgis_de.ts: translation update: checked translations some
-	minor changes git-svn-id: http://svn.osgeo.org/qgis/trunk@12527
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12525
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-20  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12524
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-19  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: more context help
-	updates (r12492, r12496, r12499, r12500) git-svn-id: http://svn.osgeo.org/qgis/trunk@12523
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-19  borysiasty 
-
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12522
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-19  jef 
-
-	* debian/qgis.desktop: fix #2289 git-svn-id: http://svn.osgeo.org/qgis/trunk@12521
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-19  jef 
-
-	* src/app/qgsnewconnection.cpp: fix #2296 git-svn-id: http://svn.osgeo.org/qgis/trunk@12520
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-19  wonder 
+    fix SIP bindings after atlas merge
 
-	* python/plugins/osm/OsmUploadDlg.py: OSM: Upload only tag which are
-	not marked as deleted. Fixes #2054.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12519
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-06
 
-2009-12-19  wonder 
+    fix project properties ows tab taborder
 
-	* src/providers/osm/osmprovider.cpp: OSM: save correctly the extent
-	of data. Most probably the cause of #2098.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12518
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-06
 
-2009-12-19  wonder 
+    add more copyrights
 
-	* python/plugins/osm/OsmDownloadDlg.py: OSM: small usability
-	improvements in download dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12517
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-06
 
-2009-12-19  mhugent 
+    Add access to the atlas' layer in the expression builder GUI for labels.
+    QgsAtlasComposition is now held by QgsComposition
 
-	* src/core/composer/qgscomposermap.cpp: Fix for bug #2117, wrong
-	composer scale if units are degree git-svn-id: http://svn.osgeo.org/qgis/trunk@12516
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: f1c9955 e54e917
+Marco Hugentobler 	2012-10-06
 
-2009-12-19  wonder 
+    Merge atlas branch
 
-	* src/gui/qgsmapcanvassnapper.cpp: Fixed snapping to background
-	layers if there's a layer that doesn't exist. Fixes #2261 git-svn-id: http://svn.osgeo.org/qgis/trunk@12515
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-06
 
-2009-12-19  wonder 
+    Remove signal which is not used anymore
 
-	* src/app/qgsoptions.cpp, src/core/qgstolerance.cpp: Use 10px as a
-	default vertex search radius. (should be a more sensitive tolerance
-	than 10 map units) git-svn-id: http://svn.osgeo.org/qgis/trunk@12514
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-06
 
-2009-12-19  rduivenvoorde 
+    Fix python composermap test
 
-	* i18n/qgis_nl.ts: dutch translation update to 100% for 1.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@12513
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-06
 
-2009-12-19  wonder 
+    sip updates
 
-	* src/app/qgsmaptoolnodetool.cpp: Display warning in node tool if it
-	couldn't find any features. Fixes #2134.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12512
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Arunmozhi 	2012-09-16
 
-2009-12-19  wonder 
+    fix for #6273
 
-	* src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp: 
-	Select a valid variant when there's no variant with the same number
-	of colors in new scheme. Fixes #2254 git-svn-id: http://svn.osgeo.org/qgis/trunk@12511
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Marco Hugentobler 	2012-10-06
 
-2009-12-19  wonder 
+    Fix for white stripes between raster tiles
 
-	* src/core/qgsvectorlayer.cpp: Clear undo stack on rollback. Fixes
-	#2287.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12510
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-06
 
-2009-12-19  macho 
+    connect slider to spinbox for opacity
 
-	* i18n/qgis_is.ts: itranslation update: icelandic by thordur first
-	release git-svn-id: http://svn.osgeo.org/qgis/trunk@12509
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-05
 
-2009-12-18  wonder 
+    german translation fix
 
-	* src/core/pal/pal.cpp, src/core/qgsgeometry.cpp,
-	src/plugins/labeling/pallabeling.cpp: Less verbosity to stdout from
-	labeling plugin git-svn-id: http://svn.osgeo.org/qgis/trunk@12508
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 94bc415 c212e91
+Giuseppe Sucameli 	2012-10-05
 
-2009-12-18  pcav 
+    Merge pull request #272 from slarosa/master
+    
+    Fix #6458
 
-	* i18n/qgis_it.ts: More cleanup of the IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12507
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Tim Sutton 	2012-10-05
 
-2009-12-18  pcav 
+    Added simple point test used in demo at hackfest in Essen
 
-	* i18n/qgis_it.ts: More minor edits to the IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12506
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Werner Macho 	2012-10-05
 
-2009-12-18  pcav 
+    adjust license to be readable by licensechecker
 
-	* i18n/qgis_it.ts: minor edits to the IT translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12505
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 7ee4a5c 7218bd3
+Hugo Mercier 	2012-10-05
 
-2009-12-17  macho 
+    Merge branch 'atlas_integration' of https://github.com/Oslandia/Quantum-GIS into atlas
 
-	* i18n/qgis_es.ts: translation update: es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@12504
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-05
 
-2009-12-17  macho 
+    Get rid of the unneeded vector of QgsFeature in atlas generation
 
-	* i18n/qgis_fr.ts, i18n/qgis_it.ts, i18n/qgis_pt_BR.ts: translation
-	updates: pt_BR, it and fr by Arthur, Flavio and Jean Roc git-svn-id: http://svn.osgeo.org/qgis/trunk@12503
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: 1905b61 9c104b3
+Pirmin Kalberer 	2012-10-05
 
-2009-12-17  mhugent 
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-	* src/core/qgsgeometry.cpp: Fix for bug #2291, Reshape Features tool
-	crashes on right mouse click git-svn-id: http://svn.osgeo.org/qgis/trunk@12501
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Pirmin Kalberer 	2012-10-05
 
-2009-12-17  borysiasty 
+    Worldwind elevation model cache removed
 
-	* resources/context_help/QgsOpenVectorLayerDialog-de_DE,
-	resources/context_help/QgsOpenVectorLayerDialog-en_US,
-	resources/context_help/QgsVectorLayerProperties-en_US,
-	resources/context_help/QgsWMSSourceSelect-en_US: Context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12500
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-05
 
-2009-12-17  borysiasty 
+    typo in console_sci
 
-	* resources/context_help/MapServerExport-en_US,
-	resources/context_help/MapServerExport-pl_PL,
-	resources/context_help/QgsCustomProjectionDialog-en_US,
-	resources/context_help/QgsGPSPlugin-de_DE,
-	resources/context_help/QgsGPSPlugin-en_US,
-	resources/context_help/QgsGPSPlugin-ru_RU,
-	resources/context_help/QgsGPSPlugin-sk_SK,
-	resources/context_help/QgsGPSPluginGui-de_DE,
-	resources/context_help/QgsGPSPluginGui-en_US,
-	resources/context_help/QgsGPSPluginGui-ru_RU,
-	resources/context_help/QgsGPSPluginGui-sk_SK,
-	resources/context_help/QgsMapserverExport-en_US,
-	resources/context_help/QgsMapserverExport-pl_PL,
-	resources/context_help/QgsNewHttpConnection-de_DE,
-	resources/context_help/QgsNewHttpConnection-en_US,
-	resources/context_help/QgsNewHttpConnection-ru_RU,
-	resources/context_help/QgsNewHttpConnection-sk_SK,
-	resources/context_help/QgsNewHttpConnection-sv_SE,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsNewVectorLayerDialog-fr_FR,
-	resources/context_help/QgsVectorLayerProperties-en_US,
-	resources/context_help/QgsWMSSourceSelect-de_DE,
-	resources/context_help/QgsWMSSourceSelect-ru_RU,
-	resources/context_help/QgsWMSSourceSelect-sk_SK,
-	resources/context_help/QgsWMSSourceSelect-sv_SE: Context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12499
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-05
 
-2009-12-17  macho 
+    Get rid of the unneeded vector of QgsExpression in atlas generation
 
-	* TRANSLATORS, i18n/qgis_ar.ts, i18n/qgis_cs_CZ.ts,
-	i18n/qgis_de.ts, i18n/qgis_el_GR.ts, i18n/qgis_es.ts,
-	i18n/qgis_fr.ts, i18n/qgis_he.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts,
-	i18n/qgis_is.ts, i18n/qgis_it.ts, i18n/qgis_ja.ts,
-	i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts, i18n/qgis_lt.ts,
-	i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts, i18n/qgis_sv.ts,
-	i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts, i18n/qgis_vi.ts,
-	i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts, i18n/qgis_zh_TW.ts: 
-	itranslation updates to all files as usual Changed TRANSLATORS to
-	include traditional Chinese Coordinator git-svn-id: http://svn.osgeo.org/qgis/trunk@12498
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Salvatore Larosa 	2012-10-05
 
-2009-12-17  macho 
+    Fix #6458
+    - added new icon in resources
+    - added tools to import QtCore,QtGui class
+    - update help and locale
 
-	* i18n/qgis_ar.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_it.ts,
-	i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts,
-	i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: itranslation update: ru by artem and another
-	script update to see if strings are really frozen :) git-svn-id: http://svn.osgeo.org/qgis/trunk@12497
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-05
 
-2009-12-16  jef 
+    add more sextante copyright headers
 
-	* resources/context_help/QgsScaleBarPluginGui-de_DE: add german
-	scalebar translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12496
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  jef 
+Merge: c5e2257 b3e2eb2
+Pirmin Kalberer 	2012-10-05
 
-	* resources/context_help/QgsPluginInstallerDialog-de_DE: german
-	translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12495
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  borysiasty 
-
-	* : GIS theme icon update from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@12494
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  macho 
-
-	* i18n/qgis_is.ts: initial translation file for iceland - brings us
-	to 32 languages git-svn-id: http://svn.osgeo.org/qgis/trunk@12493
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  jef 
-
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsPluginInstallerDialog-de_DE: german
-	translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12492
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  macho 
-
-	* i18n/qgis_es.ts, i18n/qgis_it.ts: translation update: it by
-	maurizio and es by carlos git-svn-id: http://svn.osgeo.org/qgis/trunk@12491
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  borysiasty 
-
-	* : Fix CRS definitions for Polish systems 1992 and 2000 (epsg
-	2176-2180). This is a temporary workaround until the native epsg
-	base is corrected.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12490
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  macho 
-
-	* i18n/qgis_vi.ts: translation update: vi from Huu Manh Bui git-svn-id: http://svn.osgeo.org/qgis/trunk@12489
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-16  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: grass update (r12475)
-	context help update (r12478) theme icon updates (r12479, r12484,
-	r12485) git-svn-id: http://svn.osgeo.org/qgis/trunk@12488
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2009-12-16  borysiasty 
+Juergen E. Fischer 	2012-10-05
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_gui.py, python/utils.py: 
-	Plugin installer update - rest of the r12476 git-svn-id: http://svn.osgeo.org/qgis/trunk@12487
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix language detection in console_help and german translation update
 
-2009-12-15  borysiasty 
+Merge: 88cd943 4a90e73
+Pirmin Kalberer 	2012-10-05
 
-	* i18n/qgis_pl_PL.ts: translation update: pl git-svn-id: http://svn.osgeo.org/qgis/trunk@12486
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-2009-12-15  borysiasty 
+Merge: d9c5a68 680db77
+Giuseppe Sucameli 	2012-10-05
 
-	* images/images.qrc: more GIS icons from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@12485
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #271 from slarosa/master
+    
+    minor fixes for help in console
 
-2009-12-15  borysiasty 
+Radim Blazek 	2012-10-05
 
-	* images/images.qrc: more GIS icons from Robert git-svn-id: http://svn.osgeo.org/qgis/trunk@12484
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    pseudocolor renderer GUI min/max support
 
-2009-12-15  macho 
+Salvatore Larosa 	2012-10-05
 
-	* i18n/qgis_ar.ts, i18n/qgis_cs_CZ.ts, i18n/qgis_de.ts,
-	i18n/qgis_el_GR.ts, i18n/qgis_es.ts, i18n/qgis_fr.ts,
-	i18n/qgis_he.ts, i18n/qgis_hu.ts, i18n/qgis_id.ts, i18n/qgis_it.ts,
-	i18n/qgis_ja.ts, i18n/qgis_ka_GE.ts, i18n/qgis_lo.ts,
-	i18n/qgis_lt.ts, i18n/qgis_lv.ts, i18n/qgis_mn.ts, i18n/qgis_nl.ts,
-	i18n/qgis_pl_PL.ts, i18n/qgis_pt_BR.ts, i18n/qgis_ro.ts,
-	i18n/qgis_ru.ts, i18n/qgis_sk.ts, i18n/qgis_sq_AL.ts,
-	i18n/qgis_sv.ts, i18n/qgis_th.ts, i18n/qgis_tr.ts, i18n/qgis_uk.ts,
-	i18n/qgis_vi.ts, i18n/qgis_xh.ts, i18n/qgis_zh_CN.ts,
-	i18n/qgis_zh_TW.ts: update strings ini translation files - strings
-	are in freeze from now until release QGIS 1.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@12483
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    minor fixes for help (Python Console)
 
-2009-12-15  jef 
+Merge: 1a1370f 4513ada
+Giuseppe Sucameli 	2012-10-05
 
-	* i18n/qgis_de.ts,
-	resources/context_help/QgsProjectProperties-de_DE,
-	resources/context_help/QgsProjectProperties-en_US: update german
-	translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12482
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge pull request #270 from slarosa/master
+    
+    Fix 6459
 
-2009-12-15  jef 
+Salvatore Larosa 	2012-10-05
 
-	* scripts/astyle-all.sh: update astyle-all.sh git-svn-id: http://svn.osgeo.org/qgis/trunk@12481
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Fix 6459
+    - update Italian translate
+    - renamed help console to console_help.py
+    - renamed Deutsch properties file (help translation)
+    - added MouseEvent (midbutton) to Python Console
 
-2009-12-15  wonder 
+Pirmin Kalberer 	2012-10-05
 
-	* CONTRIBUTORS,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp,
-	src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h: Applied
-	patch from #2285 by Mark Baas.  Thanks for contributing! git-svn-id: http://svn.osgeo.org/qgis/trunk@12480
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Default elevation layer for globe
 
-2009-12-15  borysiasty 
+Juergen E. Fischer 	2012-10-05
 
-	* images/images.qrc, src/app/qgisapp.cpp: Separate icons for
-	mActionShowComposerManager and mActionFilePrint git-svn-id: http://svn.osgeo.org/qgis/trunk@12479
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update (and minor cleanuppps ;))
 
-2009-12-15  borysiasty 
+cmoe 	2012-10-05
 
-	* resources/context_help/QgsPluginInstallerDialog-en_US: Context
-	help for the Plugin Installer git-svn-id: http://svn.osgeo.org/qgis/trunk@12478
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Enable snapping on intersection introduced
 
-2009-12-15  pcav 
+Juergen E. Fischer 	2012-10-05
 
-	* src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm,
-	src/plugins/grass/scripts/v.out.ogr.pg.py: Reverted change to
-	v.out.ogr.pg due to a possible bug in GRASS git-svn-id: http://svn.osgeo.org/qgis/trunk@12477
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    python fixes:
+    - update sip bindings (including QgsRasterPipe and QgsOWSSourceSelect)
+    - helpConsole: show icons from resources
 
-2009-12-15  borysiasty 
+Alexander Bruy 	2012-10-05
 
-	* python/plugins/plugin_installer/__init__.py,
-	python/plugins/plugin_installer/installer_data.py,
-	python/plugins/plugin_installer/installer_gui.py,
-	python/plugins/plugin_installer/installer_plugin.py,
-	python/plugins/plugin_installer/qgsplugininstallerbase.ui,
-	python/utils.py: Plugin installer update: one-step plugin install
-	and uninstall in QGIS>=1.4 git-svn-id: http://svn.osgeo.org/qgis/trunk@12476
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    fix #5269
 
-2009-12-15  pcav 
+Merge: 7ed05a2 372e520
+Juergen E. Fischer 	2012-10-05
 
-	* src/plugins/grass/modules-common/v.in.ogr.all.qgm,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.where.1.svg,
-	src/plugins/grass/modules-common/v.in.ogr.qgis.where.qgm: More GRASS
-	modules updated and added. Applied #2004 git-svn-id: http://svn.osgeo.org/qgis/trunk@12475
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'mapserverexport' of https://github.com/rduivenvoorde/Quantum-GIS
 
-2009-12-15  pcav 
+Juergen E. Fischer 	2012-10-05
 
-	* src/plugins/grass/modules-6.4/v.in.geonames.qgm,
-	src/plugins/grass/modules-6.4/v.in.gns.qgm,
-	src/plugins/grass/modules-common/v.distance.qgm: More GRASS modules
-	updated git-svn-id: http://svn.osgeo.org/qgis/trunk@12474
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    indentation update
 
-2009-12-15  pcav 
+Merge: 189b066 603f35c
+Juergen E. Fischer 	2012-10-05
 
-	* src/plugins/grass/modules-6.4/v.buffer.qgm,
-	src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm,
-	src/plugins/grass/modules-common/r.circle.qgm,
-	src/plugins/grass/modules-common/r.watershed.qgm,
-	src/plugins/grass/scripts/v.out.ogr.pg.py: Updated various GRASS
-	modules - patches applied (thanks Giovanni Manghi). Closes #2229 and
-	#2046 git-svn-id: http://svn.osgeo.org/qgis/trunk@12473
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    Merge branch 'master' of https://github.com/rouault/Quantum-GIS
 
-2009-12-15  timlinux 
+Juergen E. Fischer 	2012-10-05
 
-	* resources/context_help/QgsProjectProperties-en_US: Updates for
-	context help from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12469
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+    german console help translation
 
-2009-12-15  kyngchaos 
-
-	* mac/xcode/Qgis.xcodeproj/project.pbxproj: a bunch of context help
-	updates (various revisions) git-svn-id: http://svn.osgeo.org/qgis/trunk@12468
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Juergen E. Fischer 	2012-10-05
 
-2009-12-14  jef 
+    debian packaging update - also moved python console files and icons
 
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12464
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Merge: e3536e4 eae523d
+Hugo Mercier 	2012-10-05
 
-2009-12-14  jef 
+    Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
 
-	* src/app/qgisapp.cpp: fix types in what's new git-svn-id: http://svn.osgeo.org/qgis/trunk@12463
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
+Hugo Mercier 	2012-10-05
 
-2009-12-14  timlinux 
-
-	* doc/index.html: Updated whats new content in index.html git-svn-id: http://svn.osgeo.org/qgis/trunk@12462
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* images/images.qrc: Restore GIS icons for plugins git-svn-id: http://svn.osgeo.org/qgis/trunk@12461
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* src/gui/qgsmapcanvas.cpp: Don't zoomToSelected when nothing
-	selected git-svn-id: http://svn.osgeo.org/qgis/trunk@12460
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  timlinux 
-
-	* src/app/qgisapp.cpp: Added whats new text for 1.4 release.  git-svn-id: http://svn.osgeo.org/qgis/trunk@12459
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  jef 
-
-	* i18n/qgis_de.ts: german translation update git-svn-id: http://svn.osgeo.org/qgis/trunk@12458
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  jef 
-
-	* python/plugins/mapserver_export/mapserverexport.py,
-	resources/context_help/MapServerExport-en_US,
-	resources/context_help/QgsAttributeTable-de_DE,
-	resources/context_help/QgsAttributeTable-en_US,
-	resources/context_help/QgsAttributeTable-fr_FR,
-	resources/context_help/QgsAttributeTable-pl_PL,
-	resources/context_help/QgsAttributeTable-ru_RU,
-	resources/context_help/QgsAttributeTable-sk_SK,
-	resources/context_help/QgsAttributeTableDialog-de_DE,
-	resources/context_help/QgsAttributeTableDialog-en_US,
-	resources/context_help/QgsAttributeTableDialog-fr_FR,
-	resources/context_help/QgsAttributeTableDialog-pl_PL,
-	resources/context_help/QgsAttributeTableDialog-ru_RU,
-	resources/context_help/QgsAttributeTableDialog-sk_SK,
-	resources/context_help/eVisDatabaseConnectionGui-en_US,
-	src/app/attributetable/qgsattributetabledialog.h,
-	src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h,
-	src/ui/qgsattributetabledialog.ui: activate help for attribute
-	table, mapserver export and evis git-svn-id: http://svn.osgeo.org/qgis/trunk@12457
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  timlinux 
-
-	* images/images.qrc: More iconography updates from Anita Graser git-svn-id: http://svn.osgeo.org/qgis/trunk@12456
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  jef 
-
-	* src/app/qgsmaptooladdisland.cpp, src/app/qgsmaptooladdring.cpp: 
-	fix #2281 git-svn-id: http://svn.osgeo.org/qgis/trunk@12455
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  jef 
-
-	* resources/context_help/QgsCustomProjectionDialog-en_US,
-	resources/context_help/QgsOptions-en_US,
-	resources/context_help/QgsSpatiaLiteSourceSelect-en_US,
-	resources/context_help/QgsStyleV2ManagerDialog-en_US,
-	src/app/qgscustomprojectiondialog.h, src/app/qgsoptions.h,
-	src/gui/symbology-ng/qgsstylev2managerdialog.h,
-	src/helpviewer/CMakeLists.txt,
-	src/ui/qgscustomprojectiondialogbase.ui, src/ui/qgsoptionsbase.ui,
-	src/ui/qgsstylev2managerdialogbase.ui: add context help for qgis
-	options, style manager, spatialite selection and custom projection
-	and application icon to help viewer git-svn-id: http://svn.osgeo.org/qgis/trunk@12454
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewConnection-es_ES,
-	resources/context_help/QgsNewConnection-pl_PL,
-	resources/context_help/QgsNewConnection-ru_RU,
-	resources/context_help/QgsNewConnection-sk_SK,
-	resources/context_help/QgsNewConnection-sv_SE: Context help updates
-	from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12453
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* resources/context_help/QgsMeasure-de_DE,
-	resources/context_help/QgsMeasure-en_US,
-	resources/context_help/QgsMeasure-es_ES,
-	resources/context_help/QgsMeasure-pl_PL,
-	resources/context_help/QgsMeasure-ru_RU,
-	resources/context_help/QgsMeasure-sk_SK,
-	resources/context_help/QgsMeasure-sv_SE,
-	resources/context_help/QgsMeasureDialog-de_DE,
-	resources/context_help/QgsMeasureDialog-en_US,
-	resources/context_help/QgsMeasureDialog-es_ES,
-	resources/context_help/QgsMeasureDialog-pl_PL,
-	resources/context_help/QgsMeasureDialog-ru_RU,
-	resources/context_help/QgsMeasureDialog-sk_SK,
-	resources/context_help/QgsMeasureDialog-sv_SE: Context help updates
-	from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12452
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* resources/context_help/QgsIdentifyResults-de_DE,
-	resources/context_help/QgsIdentifyResults-en_US,
-	resources/context_help/QgsIdentifyResults-es_ES,
-	resources/context_help/QgsIdentifyResults-pl_PL,
-	resources/context_help/QgsIdentifyResults-ru_RU,
-	resources/context_help/QgsIdentifyResults-sk_SK,
-	resources/context_help/QgsIdentifyResults-sv_SE: Context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12451
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp,
-	src/providers/postgres/qgspostgresprovider.h: better fix for
-	slowdown of r12418 git-svn-id: http://svn.osgeo.org/qgis/trunk@12450
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  pcav 
-
-	* DONORS: Updated list of donors git-svn-id: http://svn.osgeo.org/qgis/trunk@12449
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  timlinux 
-
-	* resources/context_help/CMakeLists.txt: Arbitrary change to cause
-	makefiles to update git-svn-id: http://svn.osgeo.org/qgis/trunk@12448
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* resources/context_help/QgsDbSourceSelect-de_DE,
-	resources/context_help/QgsDbSourceSelect-en_US,
-	resources/context_help/QgsDbSourceSelect-pl_PL,
-	resources/context_help/QgsDbSourceSelect-ru_RU,
-	resources/context_help/QgsDbSourceSelect-sk_SK,
-	resources/context_help/QgsDbSourceSelect-sv_SE,
-	resources/context_help/QgsPgSourceSelect-de_DE,
-	resources/context_help/QgsPgSourceSelect-en_US,
-	resources/context_help/QgsPgSourceSelect-pl_PL,
-	resources/context_help/QgsPgSourceSelect-ru_RU,
-	resources/context_help/QgsPgSourceSelect-sk_SK,
-	resources/context_help/QgsPgSourceSelect-sv_SE: Context help updates
-	from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12447
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-14  borysiasty 
-
-	* resources/context_help/QgsBookmarks-de_DE,
-	resources/context_help/QgsCopyrightLabelPluginGui-en_US,
-	resources/context_help/QgsCopyrightLabelPluginGui-pl_PL,
-	resources/context_help/QgsCopyrightLabelPluginGui-ru_RU,
-	resources/context_help/QgsCopyrightLabelPluginGui-sk_SK,
-	resources/context_help/QgsCopyrightLabelPluginGui-sv_SE,
-	resources/context_help/QgsDelimitedTextPluginGui-pl_PL,
-	resources/context_help/QgsDelimitedTextPluginGui-ru_RU,
-	resources/context_help/QgsDelimitedTextPluginGui-sk_SK,
-	resources/context_help/QgsDelimitedTextPluginGui-sv_SE,
-	resources/context_help/QgsNorthArrowPluginGui-en_US,
-	resources/context_help/QgsScaleBarPluginGui-en_US: Context help
-	updates from Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12446
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* resources/context_help/QgsBookmarks-de_DE: german context help fix git-svn-id: http://svn.osgeo.org/qgis/trunk@12445
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* resources/context_help/QgsCreateNewVectorLayer-de_DE,
-	resources/context_help/QgsCreateNewVectorLayer-en_US,
-	resources/context_help/QgsCreateNewVectorLayer-fr_FR,
-	resources/context_help/QgsCreateNewVectorLayer-ru_RU,
-	resources/context_help/QgsCreateNewVectorLayer-sk_SK,
-	resources/context_help/QgsNewOgrConnection-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-de_DE,
-	resources/context_help/QgsNewVectorLayerDialog-en_US,
-	resources/context_help/QgsNewVectorLayerDialog-fr_FR,
-	resources/context_help/QgsNewVectorLayerDialog-ru_RU,
-	resources/context_help/QgsNewVectorLayerDialog-sk_SK: rename context
-	helps for QgsCreateNewVectorLayer to QgsNewVectorLayerDialog git-svn-id: http://svn.osgeo.org/qgis/trunk@12444
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  borysiasty 
-
-	* resources/context_help/QgsBookmarks-fr_FR,
-	resources/context_help/QgsBookmarks-ru_RU,
-	resources/context_help/QgsBookmarks-sk_SK,
-	resources/context_help/QgsBookmarks-sv_SE: Context help updates from
-	Milena git-svn-id: http://svn.osgeo.org/qgis/trunk@12443
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* src/app/qgspgsourceselect.cpp, src/app/qgspgsourceselect.h,
-	src/app/qgsspatialitesourceselect.cpp,
-	src/app/qgsspatialitesourceselect.h, src/plugins/spit/qgsspit.cpp,
-	src/plugins/spit/qgsspitbase.ui: fix #2276 git-svn-id: http://svn.osgeo.org/qgis/trunk@12442
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* src/plugins/copyright_label/plugin.cpp: apply #2277 git-svn-id: http://svn.osgeo.org/qgis/trunk@12441
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* src/providers/postgres/qgspostgresprovider.cpp: fix slowdown of
-	r12418 git-svn-id: http://svn.osgeo.org/qgis/trunk@12440
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* resources/context_help/QgsBookmarks-fr_FR,
-	resources/context_help/QgsBookmarks-ru_RU,
-	resources/context_help/QgsBookmarks-sk_SK,
-	resources/context_help/QgsBookmarks-sv_SE,
-	resources/context_help/QgsCreateNewVectorLayer-fr_FR: r12434 done
-	right git-svn-id: http://svn.osgeo.org/qgis/trunk@12439
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  rduivenvoorde 
-
-	* i18n/qgis_nl.ts: new update dutch ts file git-svn-id: http://svn.osgeo.org/qgis/trunk@12438
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  rduivenvoorde 
-
-	* i18n/qgis_nl.ts: new dutch translation git-svn-id: http://svn.osgeo.org/qgis/trunk@12437
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* resources/context_help/QgsCopyrightLabelPluginGui-de_DE,
-	resources/context_help/QgsDelimitedTextPluginGui-de_DE: de_DE
-	context help fixes git-svn-id: http://svn.osgeo.org/qgis/trunk@12436
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  wonder 
-
-	* python/core/symbology-ng-core.sip: PyQGIS: Fixed slightly
-	embarrassing conversion to subclasses in symbology-ng git-svn-id: http://svn.osgeo.org/qgis/trunk@12435
-	c8812cc2-4d05-0410-92ff-de0c093fc19c
-
-2009-12-13  jef 
-
-	* resources/context_help/QgsBookmarks-fr_FR,
-	resources/context_help/QgsBookmarks-ru_RU,
-	resources/context_help/QgsBookmarks-sk_SK,
-	resources/context_help/QgsBookmarks-sv_SE,
-	resources/context_help/QgsCreateNewVectorLayer-fr_FR,
-	resources/context_help/QgsDbSourceSelect-de_DE,
-	resources/context_help/QgsDbSourceSelect-en_US,
-	resources/context_help/QgsDbSourceSelect-pl_PL,
-	resources/context_help/QgsDbSourceSelect-ru_RU,
-	resources/context_help/QgsDbSourceSelect-sk_SK,
-	resources/context_help/QgsDbSourceSelect-sv_SE,
-	resources/context_help/QgsMapserverExport-de_DE,
-	resources/context_help/QgsNewConnection-de_DE,
-	resources/context_help/QgsNewConnection-en_US,
-	resources/context_help/QgsNewConnection-es_ES,
-	resources/context_help/QgsNewConnection-pl_PL,
-	resources/context_help/QgsNewConnection-ru_RU,
-	resources/context_help/QgsNewConnection-sk_SK,
-	resources/context_help/QgsNewConnection-sv_SE,
-	resources/context_help/QgsProjectProperties-es_ES,
-	resources/context_help/QgsProjectProperties-pl_PL,
-	resources/context_help/QgsProjectProperties-ru_RU,
-	resources/context_help/QgsProjectProperties-sk_SK,
-	resources/context_help/QgsProjectProperties-sv_SE: replace  with
-