Merge branch 'edge' into debugbreak
authorLogxen <logxen@hotmail.com>
Sat, 16 Feb 2013 22:05:39 +0000 (14:05 -0800)
committerLogxen <logxen@hotmail.com>
Sat, 16 Feb 2013 22:05:39 +0000 (14:05 -0800)
commitb34c7b9b0defccb0330e5256dd5628edfd89583d
tree218110bdcb08ac561610f3940b01bd5ee3cef247
parentd32633cc09ce3faa88f45b6c9e42a2c3e6289433
parent0e59a6599a5dada61d5ea52fcba49cb6ab11ff31
Merge branch 'edge' into debugbreak

Conflicts:
src/modules/utils/simpleshell/SimpleShell.cpp
src/modules/utils/simpleshell/SimpleShell.h
src/modules/utils/simpleshell/SimpleShell.cpp
src/modules/utils/simpleshell/SimpleShell.h