[Kstars-devel] branches/kstars/summer/kdeedu/kstars/kstars

[Akarsh Simha]

SVN commit 826207 by asimha:

Merging changes from trunk into the summer branch.

CCMAIL: kstars-devel at kde.org



 M  +85 -90    finddialog.cpp  
 M  +43 -39    finddialog.h  
 M  +3 -6      fovdialog.cpp  
 M  +1 -1      htmesh/CMakeLists.txt  
 M  +6 -1      indi/libs/fli/libfli-usb-sys-bsd.c  
 M  +1 -1      indistd.cpp  
 M  +11 -0     kstars.h  
 M  +33 -5     kstarsactions.cpp  
 M  +19 -0     opscatalog.cpp  
 M  +1 -0      opscatalog.h  
 M  +13 -6     opscatalog.ui  
 M  +14 -8     opscolors.cpp  
 M  +43 -19    tools/conjunctions.cpp  
 M  +3 -7      tools/conjunctions.h  
 M  +6 -6      tools/ksconjunct.cpp