<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/113776/">http://git.reviewboard.kde.org/r/113776/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="8" style="border: 1px gray solid;">
<tr>
<td>
<h1 style="margin-right: 0.2em; padding: 0; font-size: 10pt;">This change has been discarded.</h1>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Marble, Torsten Rahn and René Küttner.</div>
<div>By Marek Hakala.</div>
<p style="color: grey;"><i>Updated Dec. 18, 2013, 8:14 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
marble
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Solving the conflicts #1
EclipsesPlugin: Update EclSolar
This update fixes some issues with very short eclipse events.
EclipsesPlugin: Update eclipses menu on config changes
EclipsesPlugin: Enable lunar eclipses
EclipsesPlugin: Fix timezone handling
EclipsesPlugin: Fix dates for very short eclipses
EclipsesPlugin: Allow for year 0
EclipsesPlugin: Move close button to the bottom left
EclipsesPlugin: Adjust eclipse browser dialog
Normalize all coordinates involved so that everything shows up nicely in flat maps as well
Just render GeoDataLinearRings. Mute colors to something decent.
EclipsesPlugin: Allow for years B.C.
EclipsesPlugin: Do consistent variable naming
EclipsesPlugin: Fix calculation of sunset/sunrise boundaries
EclipsesPlugin: Remove deprecated method declaration
EclipsesPlugin: Do not set brush in every loop cycle
EclipsesPlugin: Do not plot central line for non-central eclipses
EclipsesPlugin: Minor code cleanup
EclipsesPlugin: EclipsesListDialog -> EclipsesBrowserDialog
EclipsesPlugin: Document methods
EclipsesPlugin: Connect plugin menu handler only once
EclipsesPlugin: Add menu separator in kde version
EclipsesPlugin: Set icons for menu items
EclipsesPlugin: Add new icons
EclipsesPlugin: Add 'Apply' button to configuration dialog
EclipsesPlugin: Implement reading and writing of settings
EclipsesPlugin: Jump to eclipse's maximum
EclipsesPlugin: Improve eclipses list dialog
EclipsesPlugin: "More Eclipses" -> "Browse Eclipses"
EclipsesPlugin: Redesign config dialog
EclipsesPlugin: Fix eclipse menu updates
EclipsesPlugin: Calculate eclipse's global start and end dates
EclipsesPlugin: Make eclipse menu items work
EclipsesPlugin: Disable epxansion of tree view on double click
EclipsesPlugin: Make list dialog work
EclipsesPlugin: Add new eclipses list dialog
EclipsesPlugin: Always reference an eclipse by year and index
EclipsesPlugin: Return references
EclipsesPlugin: Fix memory leak
EclipsesPlugin: Move render code out of model
EclipsesPlugin: Enable configuration dialog
EclipsesPlugin: Make text for maximum translatable
EclipsesPlugin: Move calculation out of paint routine
EclipsesPlugin: Add plugin icon
EclipsesPlugin: Do not stop marble clock when viewing eclipse
EclipsesPlugin: Make menu items and dialogs work
EclipsesPlugin: add initial ui files
EclipsesPlugin: move paint routine to model
EclipsesPlugin: add model and item classes
EclipsesPlugin: add sekeleton for upcoming eclipses plugin</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/apps/marble-kde/marble_part.cpp <span style="color: grey">(98092a8)</span></li>
<li>src/apps/marble-kde/marble_part.rc <span style="color: grey">(baa3618)</span></li>
<li>src/apps/marble-qt/QtMainWindow.h <span style="color: grey">(80ae250)</span></li>
<li>src/apps/marble-qt/QtMainWindow.cpp <span style="color: grey">(5615f65)</span></li>
<li>src/lib/marble/RenderPlugin.cpp <span style="color: grey">(a51b27f)</span></li>
<li>src/plugins/render/CMakeLists.txt <span style="color: grey">(c62070f)</span></li>
<li>src/plugins/render/eclipses/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesBrowserDialog.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesBrowserDialog.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesBrowserDialog.ui <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesConfigDialog.ui <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesItem.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesItem.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesModel.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesModel.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesPlugin.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesPlugin.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/EclipsesReminderDialog.ui <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/README <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/astrolib.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/astrolib.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/attlib.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/attlib.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/eclsolar.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/ecl/eclsolar.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/eclipses.qrc <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/eclipses.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/lunar_partial.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/lunar_penumbra.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/lunar_total.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/solar_annular.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/solar_partial.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/plugins/render/eclipses/res/solar_total.png <span style="color: grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/113776/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>