Merge branch 'master' of ssh://git.code.sf.net/p/nuttx/git into multinic (75346a4f) · Commits · f4grx / NuttX RTOS · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NuttX RTOS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

75346a4f

Commit 75346a4f authored 9 years ago by Gregory Nutt

Downloads
- Plain Diff

Merge branch 'master' of ssh://git.code.sf.net/p/nuttx/git into multinic

Conflicts:
	nuttx/ChangeLog

parents 0bdf2d53 94727492

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 0 deletions

ChangeLog
arch/sim/src/nuttx-names.dat 7 additions, 0 deletions

arch/sim/src/nuttx-names.dat
configs/stm32f4discovery/README.txt 13 additions, 0 deletions

configs/stm32f4discovery/README.txt
configs/stm32f4discovery/elf/defconfig 61 additions, 110 deletions

configs/stm32f4discovery/elf/defconfig
configs/stm32f4discovery/src/Makefile 1 addition, 5 deletions

configs/stm32f4discovery/src/Makefile
configs/stm32f4discovery/src/stm32_bringup.c 2 additions, 0 deletions

configs/stm32f4discovery/src/stm32_bringup.c
configs/stm32f4discovery/src/stm32_cxxinitialize.c 0 additions, 154 deletions

configs/stm32f4discovery/src/stm32_cxxinitialize.c

with 87 additions and 269 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment