← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to docs/html/wx/wx_copyrightnotice.html

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/html/wx/wx_copyrightnotice.html
11
11
Copyright (c) 1992-2006 Julian Smart, Robert Roebling, Vadim Zeitlin and other
12
12
members of the wxWidgets team<BR>
13
13
 
14
 
Portions (c) 1996 Artificial Intelligence Applications Institute<BR>
15
 
 
16
14
</CENTER><P>
17
15
Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt,
18
16
licendoc.txt) for conditions of software and documentation use.