diff options
| author | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /tools/env_embedded.c | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
Conflicts:
boards.cfg
Diffstat (limited to 'tools/env_embedded.c')
| -rw-r--r-- | tools/env_embedded.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/env_embedded.c b/tools/env_embedded.c deleted file mode 100644 index 59a63571957..00000000000 --- a/tools/env_embedded.c +++ /dev/null @@ -1 +0,0 @@ -#include "../common/env_embedded.c" |