← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
33
33
#define __GPC_KEYBOARDDEVICE_H__
34
34
 
35
35
#ifdef WIN32
36
 
#pragma warning (disable : 4786)
37
 
#endif // WIN32
 
36
#pragma warning (disable:4786)
 
37
#endif  /* WIN32 */
38
38
 
39
39
#include "SCA_IInputDevice.h"
40
40
 
87
87
        virtual void HookEscape();
88
88
};
89
89
 
90
 
#endif  // _GPC_KEYBOARDDEVICE_H
91
 
 
 
90
#endif  /* __GPC_KEYBOARDDEVICE_H__ */