1396 Commits

Author SHA1 Message Date
qPCR4vir
105ecdbc1a Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-27 01:12:46 +02:00
Jinhao
3cf10ef940 fix verbose_preprocessor 2016-06-27 07:07:50 +08:00
Jinhao
1845b41019 remove filesystem_selector 2016-06-27 00:35:04 +08:00
qPCR4vir
bb922fa683 Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-26 18:04:07 +02:00
Ariel Vina-Rodriguez
24c63e020d Update README.md 2016-06-26 13:55:33 +02:00
Jinhao
c65247b413 Merge branch 'qPCR4vir-tests' into develop 2016-06-26 19:04:56 +08:00
qPCR4vir
1eb1ac3a28 don't use VS2013 filesytem 2016-06-26 00:30:10 +02:00
qPCR4vir
a0e6a36e37 Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-26 00:28:17 +02:00
Jinhao
1aca8c9506 restore travis config 2016-06-26 06:01:21 +08:00
Jinhao
59922e7b78 remove debug information 2016-06-26 05:33:38 +08:00
qPCR4vir
265209c704 Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-25 20:44:26 +02:00
qPCR4vir
5d094e2864 20 of 55 failed, why sometimes- threading and thread-pool too 2016-06-25 20:35:51 +02:00
qPCR4vir
e134f34930 18 of 55 failed, sometimes- threading and thread-pool too 2016-06-25 20:27:05 +02:00
qPCR4vir
3dd9c7738e 3 more. 16 of 55 failed, 2 sometimes- threading and thread-pool 2016-06-25 20:16:52 +02:00
Jinhao
1a85a0a061 Merge branch 'qPCR4vir-dev_nana_fs' into develop 2016-06-26 01:59:08 +08:00
qPCR4vir
8596da0587 16 of 52 don't pass 2016-06-25 19:52:59 +02:00
qPCR4vir
cb33acf2c3 13 of 52 don't pass 2016-06-25 19:34:59 +02:00
Jinhao
d74cfb3d6f Merge branch 'beru-hotfix-1.3' into hotfix-1.3 2016-06-26 01:15:41 +08:00
Jinhao
5d67ae1bad Merge branch 'hotfix-1.3' of https://github.com/beru/nana into beru-hotfix-1.3 2016-06-26 01:15:22 +08:00
qPCR4vir
c747ebed47 test all 2016-06-25 18:37:41 +02:00
qPCR4vir
88c29e7ac1 Add a new example; textbox_line_number 2016-06-25 18:34:36 +02:00
qPCR4vir
55360a40e3 foreach ( test ${${files}}) 2016-06-25 18:19:31 +02:00
qPCR4vir
c99759ca67 endfunction 2016-06-25 18:11:42 +02:00
qPCR4vir
502171cc4f function(set_nana_test dir files) 2016-06-25 14:50:25 +02:00
qPCR4vir
91da8d1772 foreach 2016-06-25 13:59:10 +02:00
qPCR4vir
a417b17e30 reorganize tests 2016-06-25 13:55:38 +02:00
qPCR4vir
d7a1c66b79 Merge remote-tracking branch 'nana_jh/develop' into dev_nana_fs
* nana_jh/develop:
  restore travis and CMakeLists
  fix missing ~other_tag, remove some warings
  fix crash that deprecation is included in NANA_IGNORE_CONF
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug crash for travis
  debug a crash for travis
  debug a crash for travis
2016-06-25 03:58:18 +02:00
qPCR4vir
c71cccc4f6 FIX image in linux 2016-06-25 03:27:39 +02:00
qPCR4vir
82d999ecf2 FIX filebox in linux with fs_ext 2016-06-25 03:18:17 +02:00
Jinhao
1365e1f4e0 restore travis and CMakeLists 2016-06-25 06:05:59 +08:00
Jinhao
4a6331e625 fix missing ~other_tag, remove some warings 2016-06-25 06:00:40 +08:00
qPCR4vir
4450ff9678 FIX crash in VS consistently using filesysten_ext 2016-06-24 23:48:53 +02:00
Jinhao
d701650cd5 fix crash that deprecation is included in NANA_IGNORE_CONF
it crashs when build with CMake
2016-06-25 04:55:06 +08:00
Jinhao
484b84189f debug travis 2016-06-25 04:40:53 +08:00
Jinhao
15d6cea3bf debug travis 2016-06-24 23:42:47 +08:00
Jinhao
cbf4b88956 debug travis 2016-06-24 23:39:03 +08:00
Jinhao
aee106206a debug travis 2016-06-24 23:30:07 +08:00
qPCR4vir
70b1b0b9ee travis point to nana-demo.dev_nana_fs 2016-06-24 14:26:17 +02:00
qPCR4vir
3b6718d67f using explicit namespaces 2016-06-24 14:22:04 +02:00
Jinhao
cff4bee6fb debug travis 2016-06-24 13:48:28 +08:00
Jinhao
f505cfb6c7 debug travis 2016-06-24 13:42:23 +08:00
Jinhao
9f6a3afd77 debug travis 2016-06-24 12:59:28 +08:00
Jinhao
c7439625ad debug travis 2016-06-24 12:53:17 +08:00
Jinhao
ae442cc80d debug travis 2016-06-24 12:43:46 +08:00
Jinhao
eb1ae64456 debug travis 2016-06-24 12:36:09 +08:00
Jinhao
5294b4662d debug travis 2016-06-24 12:30:33 +08:00
Jinhao
dbd08c2aa7 debug crash for travis 2016-06-24 12:20:35 +08:00
Jinhao
208626a27f debug a crash for travis 2016-06-24 12:02:38 +08:00
Jinhao
5ba6d52774 debug a crash for travis 2016-06-24 11:48:15 +08:00
Jinhao
2f86b26075 update CMakeLists.txt 2016-06-24 03:17:33 +08:00