[Pytrainer-svn] SF.net SVN: pytrainer:[379] pytrainer/branches/plugins-v2

[<jb...@us...>]

Revision: 379
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=379&view=rev
Author:   jblance
Date:     2009-11-09 09:27:51 +0000 (Mon, 09 Nov 2009)

Log Message:
-----------
Merge trunk changes to plugins-v2 branch

Added Paths:
-----------
    pytrainer/branches/plugins-v2/plugins/googleearth/main.sh

Removed Paths:
-------------
    pytrainer/branches/plugins-v2/plugins/googleearth/main.sh

Property Changed:
----------------
    pytrainer/branches/plugins-v2/
    pytrainer/branches/plugins-v2/plugins/garmin-gpx/garmingpx.py
    pytrainer/branches/plugins-v2/plugins/garmin-hr/conf.xml
    pytrainer/branches/plugins-v2/plugins/garmin-hr/pytrainer.style


Property changes on: pytrainer/branches/plugins-v2
___________________________________________________________________
Modified: svn:mergeinfo
   - /pytrainer/trunk:345-347
   + /pytrainer/trunk:345-378


Property changes on: pytrainer/branches/plugins-v2/plugins/garmin-gpx/garmingpx.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /orig/pytrainer/trunk/plugins/garmin-gpx/garmingpx.py:5-244


Property changes on: pytrainer/branches/plugins-v2/plugins/garmin-hr/conf.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /orig/pytrainer/trunk/plugins/garmin-hr/conf.xml:5-134
/pytrainer/trunk/plugins/garmin-hr/conf.xml:359-378


Property changes on: pytrainer/branches/plugins-v2/plugins/garmin-hr/pytrainer.style
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /orig/pytrainer/trunk/plugins/garmin-hr/pytrainer.style:5-134
/pytrainer/trunk/plugins/garmin-hr/pytrainer.style:359-378

Deleted: pytrainer/branches/plugins-v2/plugins/googleearth/main.sh
===================================================================
--- pytrainer/branches/plugins-v2/plugins/googleearth/main.sh	2009-11-08 06:20:13 UTC (rev 378)
+++ pytrainer/branches/plugins-v2/plugins/googleearth/main.sh	2009-11-09 09:27:51 UTC (rev 379)
@@ -1,26 +0,0 @@
-#!/bin/sh
-# -*- coding: iso-8859-1 -*-
-
-#Copyright (C) Fiz Vazquez vu...@si...
-
-#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.
-
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-var=`zenity --file-selection`
-
-tmpgpx="/tmp/reg.gpx"
-gpsbabel -t -i kml -f $var -o gpx -F $tmpgpx
-
-echo $tmpgpx

Copied: pytrainer/branches/plugins-v2/plugins/googleearth/main.sh (from rev 378, pytrainer/trunk/plugins/googleearth/main.sh)
===================================================================
--- pytrainer/branches/plugins-v2/plugins/googleearth/main.sh	                        (rev 0)
+++ pytrainer/branches/plugins-v2/plugins/googleearth/main.sh	2009-11-09 09:27:51 UTC (rev 379)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# -*- coding: iso-8859-1 -*-
+
+#Copyright (C) Fiz Vazquez vu...@si...
+
+#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.
+
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+var=`zenity --file-selection`
+
+tmpgpx="/tmp/reg.gpx"
+gpsbabel -t -i kml -f $var -o gpx -F $tmpgpx
+
+echo $tmpgpx


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.