OSDN Git Service

merge main, resolving conflicts
authorAleksey Sadovoy <lex@onm.su>
Wed, 1 Dec 2010 17:26:28 +0000 (19:26 +0200)
committerAleksey Sadovoy <lex@onm.su>
Wed, 1 Dec 2010 17:26:28 +0000 (19:26 +0200)
commit806ee6de12eb9522f007582316c6c01fb7433bb6
treee34a5184379357230b8317ea823180d6f8cdbb80
parentc45a194ec8b3eb7c69b7cd5ace66c3cd7bc8da56
parent5f91ddf713762f749d2d7f3aaa14c7055c769d4f
merge main, resolving conflicts
nvdaHelper/building.txt
nvdaHelper/sconstruct
source/appModuleHandler.py
source/globalCommands.py
source/gui/__init__.py
user_docs/en/changes.t2t
user_docs/en/userGuide.t2t