← Back to branch summary

~ubuntu-branches/ubuntu/saucy/bochs/saucy-proposed

« back to all changes in this revision

Viewing changes to iodev/vmware3.h

  • Committer: Bazaar Package Importer
  • Author(s): David Futcher
  • Date: 2009-04-30 07:46:11 UTC
  • mfrom: (1.1.11 upstream) (4.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090430074611-6dih80a5mk2uvxhk
Tags: 2.3.7+20090416-1ubuntu1
https://launchpad.net/bugs/370427
* Merge from debian unstable (LP: #370427), remaining changes:
  - debian/patches/12_no-ssp.patch: Build bios with -fno-stack-protector
  - Add Replaces/Conflicts for bochsbios-qemu (<< 2.3.6-2)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iodev/vmware3.h
1
1
/////////////////////////////////////////////////////////////////////////
2
 
// $Id: vmware3.h,v 1.12 2008/01/26 22:24:03 sshwarts Exp $
 
2
// $Id: vmware3.h,v 1.14 2009/02/08 09:05:52 vruppert Exp $
3
3
/////////////////////////////////////////////////////////////////////////
4
4
 
5
5
/*
23
23
 *
24
24
 * You should have received a copy of the GNU Lesser General Public
25
25
 * License along with this library; if not, write to the Free Software
26
 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
26
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
27
27
 */
28
28
 
29
29
#ifndef _COWDISK_H