[Warzone2100-commits] [Warzone2100/warzone2100] fe4d13: Add Meta as alternative to Alt when giving scout o...

[<no...@gi...>]

Branch: refs/heads/qt
Home:   https://github.com/Warzone2100/warzone2100

Commit: fe4d13f3355f6167207f95ccc6279e8b8be9bdaf
    https://github.com/Warzone2100/warzone2100/commit/fe4d13f3355f6167207f95ccc6279e8b8be9bdaf
Author: Cyp <cy...@wz...>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M lib/framework/input.h
  M src/display.cpp
  M src/order.cpp

Log Message:
-----------
Add Meta as alternative to Alt when giving scout orders.


Commit: 23f318fe3984347675c34d743e695e719aa560b6
    https://github.com/Warzone2100/warzone2100/commit/23f318fe3984347675c34d743e695e719aa560b6
Author: Cyp <cy...@wz...>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M .gitignore
  A build_tools/autorevision.bat
  M build_tools/autorevision.sh
  M data/base/images/frontend.img
  M data/base/images/frontend4.png
  M data/base/images/intfac.img
  M data/base/images/intfac2.png
  M data/base/multiplay/skirmish/dydo.slo
  M data/mods/multiplay/old-1.10-balance/messages/strings/names.txt
  R lib/exceptionhandler/exceptionhandler.vcproj
  A lib/exceptionhandler/exceptionhandler.vcxproj
  A lib/exceptionhandler/exceptionhandler.vcxproj.filters
  M lib/framework/SDL_framerate.h
  R lib/framework/framework.vcproj
  A lib/framework/framework.vcxproj
  A lib/framework/framework.vcxproj.filters
  M lib/framework/input.h
  M lib/framework/math_ext.h
  M lib/framework/resource_lexer.l
  M lib/framework/strres_lexer.l
  M lib/framework/types.h
  M lib/framework/wzglobal.h
  M lib/gamelib/audp_lexer.l
  R lib/gamelib/gamelib.vcproj
  A lib/gamelib/gamelib.vcxproj
  A lib/gamelib/gamelib.vcxproj.filters
  R lib/iniparser/iniparser.vcproj
  A lib/iniparser/iniparser.vcxproj
  A lib/iniparser/iniparser.vcxproj.filters
  A lib/ivis_opengl/glee/ReadMe.txt
  A lib/ivis_opengl/glee/glee.vcxproj
  A lib/ivis_opengl/glee/glee.vcxproj.filters
  R lib/ivis_opengl/ivis_opengl.vcproj
  A lib/ivis_opengl/ivis_opengl.vcxproj
  A lib/ivis_opengl/ivis_opengl.vcxproj.filters
  M lib/ivis_opengl/pieblitfunc.cpp
  M lib/ivis_opengl/pieblitfunc.h
  M lib/ivis_opengl/piedef.h
  M lib/ivis_opengl/piedraw.cpp
  R lib/netplay/netplay.vcproj
  A lib/netplay/netplay.vcxproj
  A lib/netplay/netplay.vcxproj.filters
  M lib/script/chat_lexer.l
  M lib/script/chat_parser.y
  M lib/script/chat_processing.h
  M lib/script/codeprint.cpp
  M lib/script/event.cpp
  M lib/script/event.h
  M lib/script/eventsave.cpp
  M lib/script/interpreter.h
  M lib/script/parse.h
  R lib/script/script.vcproj
  A lib/script/script.vcxproj
  A lib/script/script.vcxproj.filters
  M lib/script/script_lexer.l
  M lib/script/script_parser.y
  M lib/script/stack.cpp
  R lib/sequence/sequence.vcproj
  A lib/sequence/sequence.vcxproj
  A lib/sequence/sequence.vcxproj.filters
  M lib/sound/audio.cpp
  R lib/sound/sound.vcproj
  A lib/sound/sound.vcxproj
  A lib/sound/sound.vcxproj.filters
  R lib/widget/widget.vcproj
  A lib/widget/widget.vcxproj
  A lib/widget/widget.vcxproj.filters
  M po/cs.po
  M po/da.po
  M po/de.po
  M po/en_GB.po
  M po/es.po
  M po/et_EE.po
  M po/fi.po
  M po/fr.po
  M po/fy.po
  M po/ga.po
  M po/hr.po
  M po/it.po
  M po/ko.po
  M po/la.po
  M po/lt.po
  M po/nb.po
  M po/nl.po
  M po/pl.po
  M po/pt.po
  M po/pt_BR.po
  M po/ro.po
  M po/ru.po
  M po/sk.po
  M po/sl.po
  M po/tr.po
  M po/uk_UA.po
  M po/zh_CN.po
  M po/zh_TW.po
  M src/Makefile.am
  A src/Warzone2100.vcxproj
  A src/Warzone2100.vcxproj.filters
  M src/component.cpp
  M src/configuration.cpp
  M src/display.cpp
  M src/droid.cpp
  M src/droiddef.h
  M src/fpath.cpp
  M src/frend.h
  M src/frontend.cpp
  M src/game.cpp
  M src/hci.cpp
  M src/hci.h
  M src/intdisplay.cpp
  M src/intdisplay.h
  M src/intfac.h
  M src/level_lexer.l
  M src/message_lexer.l
  M src/move.cpp
  M src/multiint.cpp
  M src/multiint.h
  M src/multimenu.cpp
  M src/order.cpp
  M src/scriptai.cpp
  M src/scriptfuncs.cpp
  M src/scriptvals_lexer.l
  M src/structure.cpp
  M src/structuredef.h
  M win32/Makefile.am
  M win32/Warzone2100.sln
  R win32/Warzone2100.vcproj
  R win32/warzone2100.vs2k5.rc

Log Message:
-----------
Merge branch 'master' into qt

Conflicts:
	lib/exceptionhandler/exceptionhandler.vcproj
	lib/framework/frame.h
	lib/framework/framework.vcproj
	lib/framework/input.h
	lib/gamelib/gamelib.vcproj
	lib/iniparser/iniparser.vcproj
	lib/ivis_opengl/ivis_opengl.vcproj
	lib/netplay/netplay.vcproj
	lib/script/script.vcproj
	lib/sequence/sequence.vcproj
	lib/sound/sound.vcproj
	lib/widget/widget.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
	src/Makefile.am
	win32/Warzone2100.vcproj


Compare: https://github.com/Warzone2100/warzone2100/compare/e5a4039...23f318f