diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-01-06 11:35:05 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-06 11:35:05 -0800 |
| commit | 8739796206f1a69880ed3a223f3a108e050292f8 (patch) | |
| tree | 1700a9355374c3f7fd341e3ee5f1c08e76c7c740 /version | |
| parent | fee8e52c0d3c9efb9566f673966f19683568d461 (diff) | |
| parent | 85c9fa1a8144edc6264bef88f5a283a4073988b9 (diff) | |
| download | syslinux-8739796206f1a69880ed3a223f3a108e050292f8.tar.gz | |
Merge branch 'master' into fsc
Resolved Conflicts:
core/configinit.inc
version
Resolved Undetected Conflicts:
core/ui.inc
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'version')
| -rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -4.00 2009 +4.00 2010 |