aboutsummaryrefslogtreecommitdiffstats
path: root/version
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-01-06 11:35:05 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-01-06 11:35:05 -0800
commit8739796206f1a69880ed3a223f3a108e050292f8 (patch)
tree1700a9355374c3f7fd341e3ee5f1c08e76c7c740 /version
parentfee8e52c0d3c9efb9566f673966f19683568d461 (diff)
parent85c9fa1a8144edc6264bef88f5a283a4073988b9 (diff)
downloadsyslinux-8739796206f1a69880ed3a223f3a108e050292f8.tar.gz
syslinux-8739796206f1a69880ed3a223f3a108e050292f8.tar.xz
syslinux-8739796206f1a69880ed3a223f3a108e050292f8.zip
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--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index 6b7452cc..5be9d7ed 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.00 2009
+4.00 2010