~ubuntu-branches/ubuntu/saucy/quassel/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/core.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-02-17 12:49:50 UTC
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: james.westby@ubuntu.com-20100217124950-v9hajw5d2xa6fszn
Tags: upstream-0.6~beta1
ImportĀ upstreamĀ versionĀ 0.6~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
538
538
                                                     .arg(Quassel::buildInfo().buildDate)
539
539
      .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
540
540
 
 
541
    reply["CoreFeatures"] = (int)Quassel::features();
 
542
 
541
543
#ifdef HAVE_SSL
542
544
    SslServer *sslServer = qobject_cast<SslServer *>(&_server);
543
545
    QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);