diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
| commit | 8b464dc6eec4d1fd58875451671456393181e980 (patch) | |
| tree | e97f998a24620c545711a3692be509768407b75d /README | |
| parent | 90118343e46fecac78b6351ce25bb610b15fc077 (diff) | |
| parent | 8df8a3d7a9d3356183df0a45c97f32dac878b65b (diff) | |
| download | barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.gz barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.xz | |
Merge branch 'for-next/doc'
Conflicts:
Makefile
Diffstat (limited to 'README')
| -rw-r--r-- | README | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -179,7 +179,7 @@ net/ -> Networking stuff scripts/ -> Kconfig system -Documentation/ -> Doxygen generated documentation +Documentation/ -> Sphinx generated documentation Release Strategy |