projects / jansson.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3008df9 3279aac)
Merge commit 'v2.4' into HEAD
authorSam hartman <hartmans@painless-security.com>
Wed, 17 Apr 2013 11:26:04 +0000 (12:26 +0100)
committerSam hartman <hartmans@painless-security.com>
Wed, 17 Apr 2013 11:26:04 +0000 (12:26 +0100)
Conflicts:
Makefile.am

1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
index 7e962db,a40aa46..5b4fb98
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,4 +1,5 @@@
- EXTRA_DIST = CHANGES LICENSE README.rst jansson.spec
 -EXTRA_DIST = CHANGES LICENSE README.rst win32
++EXTRA_DIST = CHANGES LICENSE README.rst win32 jansson.spec
++
  SUBDIRS = doc src test
  
  # "make distcheck" builds the dvi target, so use it to check that the
Jansson library