summaryrefslogtreecommitdiff
path: root/version
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-03-06 17:10:32 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-03-06 17:10:32 +0000
commit4153b9005c460e02d36c457367a045444812bb97 (patch)
treed6f41a24f4f58d0c85725f61aea0e5deba6d21cd /version
parent12eafad11c9c68c979309087d71f1c76e3f1c4b9 (diff)
parent16aa878d78086e9bc1c1f1053dc24da295f81e05 (diff)
downloadsyslinux-5.10-pre1.tar.gz
Merge branch 'lwip-merge' into elflinksyslinux-5.10-pre1
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index e5c9c4cd..7d837934 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-5.02 2013
+5.10 2013