Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/Quantum-GIS

  • Loading branch information
volaya committed Oct 28, 2012
2 parents 8f6ae95 + fe08fd6 commit 83f67129fd39d296f0221ba4a0a0606d12ccc530
Showing with 2 additions and 20 deletions.
  1. +2 −2 ms-windows/osgeo4w/preremove-desktop.bat
  2. +0 −18 tests/ctest2junix.xsl
@@ -1,6 +1,6 @@
del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk"
del "%OSGEO4W_STARTMENU%\Quantum GIS Desktop (@version@).lnk"
del "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk"
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk"
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Desktop (@version@).lnk"
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk"
del "%OSGEO4W_ROOT%"\bin\@package@.bat
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
@@ -1,21 +1,3 @@
<!--
***************************************************************************
ctest2junix.xsl
----------------------
begin : July 2012
copyright : (C) 2012 by Tim Sutton
email : tim at linfiniti dot com
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="xml" indent="yes"/>

0 comments on commit 83f6712

Please sign in to comment.
You can’t perform that action at this time.