Merge branch 'master' of /p/paradyn/development/xmeng/dyninstapi/dyninst
authorSteveXiSong <songxi.buaa@gmail.com>
Tue, 16 Jun 2015 21:22:51 +0000 (16:22 -0500)
committerSteveXiSong <songxi.buaa@gmail.com>
Tue, 16 Jun 2015 21:22:51 +0000 (16:22 -0500)
commit694d1c55df9e997b813ba043d7ee315c341002c3
tree48607390ef6c976e99019e8387518d3ccdace059
parent64eec36627aa60a7031acd2c06c3270598a39731
parentbdb57c065ab3dea3a850c93d3709c24391cde569
Merge branch 'master' of /p/paradyn/development/xmeng/dyninstapi/dyninst

Conflicts:
dyninstAPI/src/ast.C

modified:   dyninstAPI/src/ast.C
modified:   dyninstAPI/src/emit-x86.h
modified:   dyninstAPI/src/emitter.h
dyninstAPI/src/ast.C