Merge branch 'next' of git://github.com/akheron/jansson into c++-docs

This commit is contained in:
Sean Middleditch 2010-01-21 16:59:15 -08:00
commit 319970cec9
2 changed files with 4 additions and 8 deletions

View file

@ -1,8 +1,6 @@
// janssonxx - C++ wrapper for jansson, implementation file
// Copyright (c) 2010 Sean Middleditch <sean@middleditch.us>
//
// author: Sean Middleditch <sean@middleditch.us>
//
// janssonxx is free software; you can redistribute it and/or modify
// Jansson is free software; you can redistribute it and/or modify
// it under the terms of the MIT license. See LICENSE for details.
#if !defined(IN_JANSSON_HPP)

View file

@ -1,8 +1,6 @@
// janssonxx - C++ wrapper for jansson
// Copyright (c) 2010 Sean Middleditch <sean@middleditch.us>
//
// author: Sean Middleditch <sean@middleditch.us>
//
// janssonxx is free software; you can redistribute it and/or modify
// Jansson is free software; you can redistribute it and/or modify
// it under the terms of the MIT license. See LICENSE for details.
#if !defined(JANSSON_HPP)