diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-03-28 21:44:41 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-03-28 21:44:41 +0300 |
| commit | 4e63fcd55d874485071073f181dbfc5b9e196600 (patch) | |
| tree | 8c1aa0262a7ee2cdd6cc5c56b06b76660fd2d45e /.gitignore | |
| parent | 49880cbabeb597a9c748a3d5f37e9961a084dce3 (diff) | |
| parent | 024106bbfbd7376656876aa8bd00a333d5ada10c (diff) | |
| download | jansson-4e63fcd55d874485071073f181dbfc5b9e196600.zip jansson-4e63fcd55d874485071073f181dbfc5b9e196600.tar.gz jansson-4e63fcd55d874485071073f181dbfc5b9e196600.tar.bz2 | |
Merge branch '1.2'
Conflicts:
configure.ac
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -24,3 +24,4 @@ missing stamp-h1 *.pyc *.pc +/src/jansson.h |