David Quintana 930d7fff14 [BROWSEUI] ...

* Fix usage of outdated CMergedFolder to use the proper interface.

svn path=/branches/shell-experiments/; revision=63847

2014-08-09 15:56:05 +00:00

..

applications

* Sync to trunk r63845.

2014-08-09 14:15:16 +00:00

services

…

setup

* Sync to trunk r63845.

2014-08-09 14:15:16 +00:00

shell

[BROWSEUI]

2014-08-09 15:56:05 +00:00

system

…

CMakeLists.txt

…