OSDN Git Service

resolved conflict jpbranch
authorTakuya Nishimoto <nishimotz@gmail.com>
Mon, 2 Jun 2014 05:08:08 +0000 (14:08 +0900)
committerTakuya Nishimoto <nishimotz@gmail.com>
Mon, 2 Jun 2014 05:08:08 +0000 (14:08 +0900)
commitb6dfdf7db134080ae3366faabb4b37b762f740e1
treec1cd8611812fd822ac75da77074f1cd7dd789592
parenta8e426aafc83a22d2b615d6b85224b8b83d75e2b
parent01d26beb7daaeb45848ef760530bbe2590b00079
resolved conflict
source/NVDAObjects/behaviors.py
source/versionInfo.py