Mercurial > hg > freeDiameter
comparison libfdcore/core.c @ 961:d95cd3ca9e8d
merge latest 1.1 branch (one commit post 1.1.6)
author | Thomas Klausner <tk@giga.or.at> |
---|---|
date | Wed, 06 Mar 2013 20:09:54 +0100 |
parents | cce5d4bace82 5053f1abcf5d |
children | 2091bf698fb1 |
comparison
equal
deleted
inserted
replaced
960:f39fa6cd86e0 | 961:d95cd3ca9e8d |
---|---|
1 /********************************************************************************************************* | 1 /********************************************************************************************************* |
2 * Software License Agreement (BSD License) * | 2 * Software License Agreement (BSD License) * |
3 * Author: Sebastien Decugis <sdecugis@freediameter.net> * | 3 * Author: Sebastien Decugis <sdecugis@freediameter.net> * |
4 * * | 4 * * |
5 * Copyright (c) 2012, WIDE Project and NICT * | 5 * Copyright (c) 2013, WIDE Project and NICT * |
6 * All rights reserved. * | 6 * All rights reserved. * |
7 * * | 7 * * |
8 * Redistribution and use of this software in source and binary forms, with or without modification, are * | 8 * Redistribution and use of this software in source and binary forms, with or without modification, are * |
9 * permitted provided that the following conditions are met: * | 9 * permitted provided that the following conditions are met: * |
10 * * | 10 * * |