Merge branch 'master' of github.com:projectNe10/Ne10 into cplusplus
authoryang <yang.zhang@arm.com>
Mon, 25 Jun 2012 03:30:48 +0000 (11:30 +0800)
committeryang <yang.zhang@arm.com>
Mon, 25 Jun 2012 03:30:48 +0000 (11:30 +0800)
Conflicts:
ReleaseNote.txt

1  2 
ReleaseNote.txt

diff --cc ReleaseNote.txt
@@@ -217,4 -217,4 +217,5 @@@ Details of how to do this are too proje
          Each function is implemented in C, ARM Assembly and NEON code as a
          basis for comparison. Assembly versions, while efficient, are not
          intended as best-practice examples.
+     * Added CMake to implement cross-platform build system
 +    * Added support for C++