Merge tag 'test_omx_omap5' into cleanup
authorChris Ring <cring@ti.com>
Tue, 5 Mar 2013 15:48:27 +0000 (07:48 -0800)
committerChris Ring <cring@ti.com>
Tue, 5 Mar 2013 15:48:27 +0000 (07:48 -0800)
test_omx sample built for OMAP5 SMP

Conflicts:
.gitignore

1  2 
.gitignore
packages/ti/configs/omap54xx/IpcCommon.cfg.xs

diff --cc .gitignore
index 8b22d915a8fcb4754c2779bdbdce2e087ed3edec,b81da08d2aa90e93b55ad76b7a3726fc3758a199..8276cb843abff690867a726fbb7ed42c2ec64654
@@@ -27,7 -27,7 +27,8 @@@ packages/ti/ipc/transports/TransportVir
  packages/ti/ipc/transports/TransportVirtioSetup.h
  packages/ti/trace/SysMin.h
  packages/ti/resources/IpcMemory.h
+ packages/ti/srvmgr/omx/OmxSrvMgr.h
 +*.tar.gz
  
  # Linux stuff
  /autom4te.cache