1314 Commits

Author SHA1 Message Date
qPCR4vir
a6e8d88ae8 install -DCMAKE_INSTALL_PREFIX=.. 2016-06-27 16:59:26 +02:00
qPCR4vir
98ed89c097 - cp -v ../nana-demo/Examples ../ 2016-06-27 16:35:23 +02:00
qPCR4vir
fffa89ea5c - cp -v nana-demo/Examples 2016-06-27 16:17:24 +02:00
qPCR4vir
5b74b38b13 - mv -v nana-demo/Examples . 2016-06-27 16:08:00 +02:00
qPCR4vir
b5822df1ec set the same options !? 2016-06-27 15:24:28 +02:00
qPCR4vir
72f950282a make ../nana-demo 2016-06-27 14:15:29 +02:00
qPCR4vir
1a1e86fc92 build ../nana-demo 2016-06-27 13:16:07 +02:00
qPCR4vir
4886dcd840 build ../nana_demo 2016-06-27 13:10:43 +02:00
qPCR4vir
26a2b5ac63 put in ../nana_lib the lib and the includes 2016-06-27 13:00:44 +02:00
qPCR4vir
939cc04c67 Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-27 11:17:43 +02:00
Jinhao
a8219fe760 modifiable mouse wheel scroll step 2016-06-27 10:36:08 +08:00
qPCR4vir
234c94aaf4 Merge remote-tracking branch 'origin/tests' into tests 2016-06-27 01:55:18 +02:00
qPCR4vir
6328ae0cfd no cd ../lib 2016-06-27 01:55:05 +02:00
Ariel Vina-Rodriguez
11bfe65044 no tabs 2016-06-27 01:46:05 +02:00
qPCR4vir
37205f0aa9 relative dir 2016-06-27 01:37:09 +02:00
qPCR4vir
a68155c7d7 Build build demos separately. 2016-06-27 01:25:48 +02:00
qPCR4vir
11bd0bcf88 remove filesystem_selector 2016-06-27 01:24:19 +02:00
qPCR4vir
dbc011a212 Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-27 01:22:55 +02:00
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