diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-10 00:05:39 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-14 22:17:37 +0000 |
commit | 30ea534e61594cbe41651e8110aa5ead2e947ed6 (patch) | |
tree | 1105e1b25aecdd072e8fb9b02a4291a86ba713e6 /Makefile | |
parent | af6bfbc44713ed2c19a81aac88bb0e3eb9d8aa20 (diff) | |
parent | 43097ebfc2bc9bc0f721f5f80dc1aede1f7e10d7 (diff) | |
download | nyancat-30ea534e61594cbe41651e8110aa5ead2e947ed6.tar.gz |
Merge branch 'master' of git://github.com/klange/nyancat
Conflicts:
Makefile
Diffstat (limited to '')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ package = nyancat -version = 1.0 +version = 1.1 tarname = $(package) distdir = $(tarname)-$(version) |