Merge brnach 'stable-1.2'

This commit is contained in:
Hyunin Song
2017-11-24 09:50:57 +09:00
20 changed files with 137 additions and 42 deletions

View File

@@ -28,10 +28,10 @@
02111-1307, USA or point your web browser to http://www.gnu.org.
*/
#include <algorithm>
#include "basics.h"
#include <algorithm>
#include "SweepVF.h"
#include "Descriptor.h"