[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] /: Merge remote-tracking branch 'origin/master' into
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.58F0D580C5 () git ! kde ! org
[Download RAW message or body]

Git commit aa515bc1226f433e5ca8b88d30cd259fbd76f67f by Niko Sams.
Committed on 08/12/2011 at 21:03.
Pushed by nsams into branch 'master'.

Merge remote-tracking branch 'origin/master' into track-extendeddata

Conflicts:
	src/lib/geodata/data/GeoDataTrack.cpp


http://commits.kde.org/marble/aa515bc1226f433e5ca8b88d30cd259fbd76f67f


[prev in list] [next in list] [prev in thread] [next in thread]