← Back to branch summary

~stellarium/stellarium/trunk

« back to all changes in this revision

Viewing changes to plugins/Satellites/src/Satellite.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-16 11:21:44 UTC
  • mfrom: (8454.1.100 SoCiS2016)
  • Revision ID: georg.zotti@univie.ac.at-20170516112144-mckvrgf8acksrghd
Merge-in SoCiS2016: Irregular solar system objects, RemoteSync plugin, Scenery3D improvements. Big merge, and raises Qt requirement to Qt5.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Satellites/src/Satellite.cpp
48
48
 
49
49
#define sqr(a) ((a)*(a))
50
50
 
 
51
const QString Satellite::SATELLITE_TYPE = QStringLiteral("Satellite");
 
52
 
51
53
// static data members - will be initialised in the Satallites class (the StelObjectMgr)
52
54
StelTextureSP Satellite::hintTexture;
53
55
float Satellite::showLabels = true;