Public Git Hosting - gemrb.git/commit

commit	2bf2012b5616bfdd9019f4705e4181c9817a8569
author	Tom Prince <tom.prince@ualberta.net>
	Sat, 19 Jun 2010 12:55:00 +0000 (19 08:55 -0400)
committer	Tom Prince <tom.prince@ualberta.net>
	Sat, 19 Jun 2010 12:55:00 +0000 (19 08:55 -0400)
tree	bb2e8763eaf08b9ea32c6b75ad318605c821db5e	tree \| snapshot (tar.gz zip)
parent	080e9b3f88d81ab58f05701167e56a7514333699	commit \| diff
parent	672e9e42ecd56567bf72be79dfe0714dd3f92e20	commit \| diff

Merge branch 'events'.

Conflicts:
gemrb/GUIScripts/LUSpellSelection.py

gemrb/GUIScripts/LUProfsSelection.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/LUSkillsSelection.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/LUSpellSelection.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/LevelUp.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/TextScreen.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/bg1/GUICommonWindows.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/bg2/GUICommonWindows.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/bg2/LUHLASelection.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/iwd/GUICommonWindows.py	diff1 \|	diff2 \|	blob \| history
gemrb/GUIScripts/iwd2/GUICommonWindows.py	diff1 \|	diff2 \|	blob \| history