Skip to content

Commit 83f6712

Browse files
committed
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
2 parents 8f6ae95 + fe08fd6 commit 83f6712

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

ms-windows/osgeo4w/preremove-desktop.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk"
1+
del "%OSGEO4W_STARTMENU%\Quantum GIS Desktop (@version@).lnk"
22
del "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk"
3-
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk"
3+
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Desktop (@version@).lnk"
44
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk"
55
del "%OSGEO4W_ROOT%"\bin\@package@.bat
66
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat

tests/ctest2junix.xsl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
<!--
2-
***************************************************************************
3-
ctest2junix.xsl
4-
----------------------
5-
begin : July 2012
6-
copyright : (C) 2012 by Tim Sutton
7-
email : tim at linfiniti dot com
8-
***************************************************************************/
9-
10-
/***************************************************************************
11-
* *
12-
* This program is free software; you can redistribute it and/or modify *
13-
* it under the terms of the GNU General Public License as published by *
14-
* the Free Software Foundation; either version 2 of the License, or *
15-
* (at your option) any later version. *
16-
* *
17-
***************************************************************************
18-
-->
191
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
202
<xsl:output method="xml" indent="yes"/>
213

0 commit comments

Comments
 (0)