diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
| commit | cfc200714ddfa6d76feb836c258b1135d91a8348 (patch) | |
| tree | ecc4628fc161de5044c9acb03bb63b2fd48ae75c /target/wag54g | |
| parent | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff) | |
| parent | 91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/digitemp/Makefile
Diffstat (limited to 'target/wag54g')
| -rw-r--r-- | target/wag54g/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile index d86ada854..44ce7734f 100644 --- a/target/wag54g/Makefile +++ b/target/wag54g/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. |