projects / platform / upstream / ne10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d3f307 ec01a9b)
Merge branch 'master' of git://github.com/projectNe10/Ne10 into license
authoryang <yang.zhang@arm.com>
Wed, 24 Oct 2012 08:34:56 +0000 (16:34 +0800)
committeryang <yang.zhang@arm.com>
Wed, 24 Oct 2012 08:34:56 +0000 (16:34 +0800)
Conflicts:
README.txt

1  2 
README.txt patch | diff1 | diff2 | blob | history

diff --cc README.txt
index 72eba20,b0e5286..4e76e6e
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -1,5 -1,4 +1,4 @@@
- 
 -Copyright (c) 2011-12, ARM Limited
 +Copyright 2012 ARM Limited
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
Domain: Machine Learning / ML Framework;