← Back to branch summary

~ubuntu-branches/ubuntu/trusty/chromium/trusty

« back to all changes in this revision

Viewing changes to src/MenuGL.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Paul Wise
  • Date: 2009-02-19 14:01:45 UTC
  • mfrom: (0.1.4 upstream) (2.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090219140145-f5sn95pah8s5ddwa
Tags: 0.9.13.3-1
http://bugs.debian.org/492446
* New upstream release
  - Using the CDROM for music is off by default and
    the manual page documents the use_cdrom option (Closes: #492446)
  - bindir/datadir customisations were removed so use ./configure args
* Improve the descriptions for the chromium & chromium-data packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/MenuGL.cpp
5
5
 * it and/or use it and/or modify it under the terms of the 
6
6
 * "Artistic License" 
7
7
 */
 
8
 
 
9
#ifdef HAVE_CONFIG_H
 
10
#include <config.h>
 
11
#endif
 
12
 
8
13
#include "MenuGL.h"
9
14
 
10
15
#include <cstdlib>
12
17
#include <cmath>
13
18
 
14
19
#include "compatibility.h"
 
20
 
 
21
#ifdef HAVE_APPLE_OPENGL_FRAMEWORK
 
22
#include <OpenGL/gl.h>
 
23
#include <glpng/glpng.h>
 
24
#else
15
25
#include <GL/gl.h>
16
26
#include <GL/glpng.h>
 
27
#endif
17
28
 
18
29
#include "Config.h"
19
30