Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:andreer/lispbox
Browse files Browse the repository at this point in the history
Conflicts:

	GNUmakefile
  • Loading branch information
andreer committed May 14, 2010
2 parents 0ceb3bc + fd5e1b8 commit 94fa731
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions GNUmakefile.emacs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ endif

ifeq ($(os),Darwin)

EMACS_VERSION := emacs-23.2
sourcetar := $(EMACS_VERSION).tar.gz

staging-archives/$(THING).tar.gz: staging/$(EMACS_VERSION)/nextstep/$(THING)
Expand Down

0 comments on commit 94fa731

Please sign in to comment.