summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-04-29 16:07:41 +0100
committerRon Yorston <rmy@pobox.com>2012-04-29 16:07:41 +0100
commit1129137ac4ad59034828f00456eed72dc5b6c8e6 (patch)
tree411cdb3787513e79aa5bcbfa2cb5c8fdc000be0a /Makefile
parentfd571d9c7525247c0cdcf154f547d4658df0837e (diff)
parentd133144d41c2fef883d28497acafe59b6bc6043b (diff)
downloadbusybox-w32-1129137ac4ad59034828f00456eed72dc5b6c8e6.tar.gz
busybox-w32-1129137ac4ad59034828f00456eed72dc5b6c8e6.tar.bz2
busybox-w32-1129137ac4ad59034828f00456eed72dc5b6c8e6.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cfe4d5219..424c3daf1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 1 1VERSION = 1
2PATCHLEVEL = 20 2PATCHLEVEL = 21
3SUBLEVEL = 0 3SUBLEVEL = 0
4EXTRAVERSION = 4EXTRAVERSION = .git
5NAME = Unnamed 5NAME = Unnamed
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*