← Back to branch summary

~ubuntu-branches/ubuntu/raring/ginkgocadx/raring-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/commands/comandocalibrado.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2011-07-14 16:17:51 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110714161751-6wngu3xs307thgpr
Tags: 2.5.1.0-1
http://bugs.debian.org/630877
http://bugs.debian.org/631205
* New upstream version (all patches applied)
  Closes: #630877
* debian/patches/drop_rpath.patch: Fix remaining rpath issue
* debian/{mime,sharedmimeinfo}: Mime info for DICOM images
  Closes: #631205
* Add upstream manpage + desktop file
* Fixed Vcs fields
* debian/rules:
   - Add new extension liblightvisualizator
   - remove get-orig-source target which becames void because
     upstream dropped the debian/ dir
   - Hack around explicite rpath definitions
* debian/install: move conformance.xml into place
* debian/watch: drop useless comments
* debian/ginkgocadx.lintian-overrides: Drop unneeded overrides
  as well as those which stay in effect.  These should vanish
  once rpath is correctly fixed - so the warning should not
  be hidden here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/commands/comandocalibrado.cpp
1
1
/*
2
 
 *  $Id: comandocalibrado.cpp 3558 2011-03-20 20:02:22Z carlos $
 
2
 *  $Id: comandocalibrado.cpp 3893 2011-06-21 13:01:56Z tovar $
3
3
 *  Proyecto Ginkgo
4
4
 *
5
5
 *  Copyright 2008 MetaEmotion S.L. All rights reserved.
12
12
//#include <eventos/eventosginkgo.h>
13
13
//#include <main/dialogos/calibrado/datospersistentescalibrado.h>
14
14
//
15
 
//#include <wx/confbase.h>
 
15
//#include <main/controllers/configurationcontroller.h>
16
16
//#include <wx/filename.h>
17
17
//#include <wx/file.h>
18
18
//#include <wx/dir.h>
19
 
//#include <wx/confbase.h>
 
19
//#include <main/controllers/configurationcontroller.h>
20
20
//
21
21
//#ifdef __DEPRECATED
22
22
//#undef __DEPRECATED