SVN commit 1186596 by asimha: Merging from trunk to Open GL branch. Manually merged revisions 1186056 and 1186058. This breaks compile in the OpenGL branch because of the latest changes I made by introducing a TargetListComponent. CCMAIL: hdevalence@gmail.com, kstars-devel@kde.org Merged revisions 1170211-1186055,1186057,1186059-1186595 via svnmerge from svn+ssh://asimha@svn.kde.org/home/kde/trunk/KDE/kdeedu/kstars ........ r1172744 | mutlaqja | 2010-09-07 18:33:51 -0500 (Tue, 07 Sep 2010) | 1 line Enable KStars to read ascii data streams from INDI drivers ........ r1175723 | mutlaqja | 2010-09-15 12:38:10 -0500 (Wed, 15 Sep 2010) | 5 lines Enable user to select whether KStars may receive binary data transfers from a driver or not. CCMAIL:kstars-devel@kde.org ........ r1176764 | coles | 2010-09-18 10:50:46 -0500 (Sat, 18 Sep 2010) | 3 lines Proof-reading: vica versa -> vice-versa, and added missing period at the end of the sentence. ........ r1178408 | dfaure | 2010-09-22 19:02:11 -0500 (Wed, 22 Sep 2010) | 2 lines fix compilation with strict iterators, and test iterator before using it ........ r1182308 | mlaurent | 2010-10-04 02:19:29 -0500 (Mon, 04 Oct 2010) | 2 lines Fix ui files ........ r1182571 | dfaure | 2010-10-04 18:51:07 -0500 (Mon, 04 Oct 2010) | 3 lines Make executable the Type=Application .desktop files we install, so that they can be used even from a KDE running in another prefix (http://markmail.org/message/4p3krovtnzwx35zd) ........ r1182723 | pino | 2010-10-05 08:31:57 -0500 (Tue, 05 Oct 2010) | 4 lines static i18n strings are generally a no-no CCBUG: 253302 ........ r1184292 | mutlaqja | 2010-10-09 14:10:17 -0500 (Sat, 09 Oct 2010) | 1 line disable unnecessary debug message ........ r1184932 | mutlaqja | 2010-10-11 16:23:21 -0500 (Mon, 11 Oct 2010) | 4 lines Enable user to pre-select a port for each device in the device manager. CCMAIL:kstars-devel@kde.org ........ r1184951 | mutlaqja | 2010-10-11 17:42:34 -0500 (Mon, 11 Oct 2010) | 1 line Make sure no one is listening to user selected custom port before starting a server ........ r1185392 | mutlaqja | 2010-10-13 03:31:22 -0500 (Wed, 13 Oct 2010) | 1 line Support reading of device specific ports from driver xml file ........ r1185676 | mlaurent | 2010-10-14 02:39:32 -0500 (Thu, 14 Oct 2010) | 2 lines not initialize a QString to 0 ........ r1185805 | mlaurent | 2010-10-14 04:26:57 -0500 (Thu, 14 Oct 2010) | 2 lines Fix mem leak + const'ify ........ r1185807 | mlaurent | 2010-10-14 04:28:30 -0500 (Thu, 14 Oct 2010) | 2 lines Fix mem leak ........ r1186054 | asimha | 2010-10-15 01:35:05 -0500 (Fri, 15 Oct 2010) | 1 line Adding a new typedef ........ r1186055 | asimha | 2010-10-15 01:35:49 -0500 (Fri, 15 Oct 2010) | 4 lines Adding a new SkyComponent called TargetListComponent, that manages drawing of target circles around objects specified in a list. Will move the observing list into one of these from the overlays in the next commit(s). ........ r1186472 | mutlaqja | 2010-10-16 10:31:34 -0500 (Sat, 16 Oct 2010) | 1 line Improve binary BLOB handling ........ r1186561 | mutlaqja | 2010-10-16 16:20:16 -0500 (Sat, 16 Oct 2010) | 1 line Fix INDI alignment issue and missing signal in SimClock ........ _M . (directory) M +1 -0 kstars/CMakeLists.txt M +2 -1 kstars/dialogs/locationdialog.cpp M +23 -4 kstars/indi/devicemanager.cpp M +1 -0 kstars/indi/devicemanager.h M +33 -3 kstars/indi/indidevice.cpp M +3 -1 kstars/indi/indidevice.h M +92 -38 kstars/indi/indidriver.cpp M +8 -1 kstars/indi/indidriver.h M +1 -1 kstars/indi/indimenu.cpp M +0 -4 kstars/indi/indimenu.h M +1 -1 kstars/indi/indiproperty.cpp M +39 -32 kstars/indi/indistd.cpp M +7 -6 kstars/indi/indistd.h M +1 -1 kstars/indi/telescopewizardprocess.cpp _M kstars/kstars.desktop M +1 -1 kstars/kstarsdata.h M +1 -1 kstars/kstarsinit.cpp M +12 -0 kstars/skycomponents/skymapcomposite.cpp M +2 -0 kstars/skycomponents/skymapcomposite.h M +2 -0 kstars/skycomponents/typedef.h M +38 -0 kstars/skymapdraw.cpp M +2 -2 kstars/skyobjects/skyobject.cpp M +0 -1 kstars/tools/lcgenerator.cpp M +0 -3 kstars/widgets/genericcalendarwidget.ui http://websvn.kde.org/?view=rev&revision=1186596 _______________________________________________ Kstars-devel mailing list Kstars-devel@kde.org https://mail.kde.org/mailman/listinfo/kstars-devel