[Kstars-devel] branches/kstars/summer

[Prakash Mohan]

SVN commit 977892 by prakash:

Merging chages from trunk into Branch after resolving some conflicts.

CCMAIL: kstars-devel at kde.org


 _M            . (directory)  
 M  +2 -2      kstars/kstars/kstars.desktop  
 M  +1 -1      kstars/kstars/main.cpp  
 M  +3 -2      kstars/kstars/skycomponents/asteroidscomponent.cpp  
 M  +3 -2      kstars/kstars/skycomponents/cometscomponent.cpp  
 M  +13 -12    kstars/kstars/skycomponents/solarsystemcomposite.cpp  
 M  +9 -4      kstars/kstars/skyobjects/auxinfo.h  
 M  +15 -9     kstars/kstars/skyobjects/deepskyobject.cpp  
 M  +8 -9      kstars/kstars/skyobjects/deepskyobject.h  
 M  +12 -13    kstars/kstars/skyobjects/ksasteroid.cpp  
 M  +4 -11     kstars/kstars/skyobjects/ksasteroid.h  
 M  +8 -14     kstars/kstars/skyobjects/kscomet.cpp  
 M  +3 -10     kstars/kstars/skyobjects/kscomet.h  
 M  +7 -2      kstars/kstars/skyobjects/ksmoon.cpp  
 M  +40 -39    kstars/kstars/skyobjects/ksmoon.h  
 M  +12 -6     kstars/kstars/skyobjects/ksplanet.cpp  
 M  +4 -5      kstars/kstars/skyobjects/ksplanet.h  
 M  +17 -23    kstars/kstars/skyobjects/ksplanetbase.cpp  
 M  +3 -20     kstars/kstars/skyobjects/ksplanetbase.h  
 M  +10 -4     kstars/kstars/skyobjects/kspluto.cpp  
 M  +3 -2      kstars/kstars/skyobjects/kspluto.h  
 M  +7 -2      kstars/kstars/skyobjects/kssun.cpp  
 M  +20 -21    kstars/kstars/skyobjects/kssun.h  
 M  +12 -25    kstars/kstars/skyobjects/skyobject.cpp  
 M  +13 -8     kstars/kstars/skyobjects/skyobject.h  
 M  +1 -1      kstars/kstars/skyobjects/skypoint.cpp  
 M  +1 -2      kstars/kstars/skyobjects/skypoint.h  
 M  +18 -16    kstars/kstars/skyobjects/starobject.cpp  
 M  +8 -6      kstars/kstars/skyobjects/starobject.h  
 M  +4 -4      kstars/kstars/skyobjects/trailobject.cpp  
 M  +2 -6      kstars/kstars/skyobjects/trailobject.h  
 M  +15 -17    kstars/kstars/tools/altvstime.cpp  
 M  +9 -9      kstars/kstars/tools/altvstime.h  
 M  +1 -20     kstars/kstars/tools/conjunctions.cpp  
 M  +5 -9      kstars/kstars/tools/ksconjunct.cpp  
 M  +0 -1      kstars/kstars/tools/ksconjunct.h  
 M  +2 -2      kstars/kstars/tools/modcalcdaylength.cpp  
 M  +26 -64    kstars/kstars/tools/modcalcplanets.cpp  
 M  +3 -9      kstars/kstars/tools/modcalcplanets.h  
 M  +2 -3      kstars/kstars/tools/modcalcvizequinox.cpp  
 M  +1 -1      kstars/kstars/tools/planetviewer.cpp  


http://websvn.kde.org/?view=rev&revision=977892