~ubuntu-branches/ubuntu/vivid/qt3d-opensource-src/vivid-proposed

« back to all changes in this revision

Viewing changes to src/threed/materials/qglmaterial_p.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2013-08-02 11:10:16 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130802111016-r3cjsz79ulbawpgv
Tags: 5.0~git20130731-0ubuntu1
* New upstream snapshot release
* Improve override_dh_auto_install, use --fail-missing
* Drop patches:
  - add_GPL_license_file.patch, merged upstream
  - add_module_version.patch, added upstream
  - disable_conflicting_examples.patch, not needed anymore
* Refresh link_against_system_zlib.patch
* Add bug link to workaround_zlib_linking_issue.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
 
58
58
#include <QtCore/qmap.h>
59
59
 
60
 
QT_BEGIN_HEADER
61
 
 
62
60
QT_BEGIN_NAMESPACE
63
61
 
64
62
class QGLMaterialPrivate
81
79
 
82
80
QT_END_NAMESPACE
83
81
 
84
 
QT_END_HEADER
85
 
 
86
82
#endif