Project

General

Profile

Revision ca88e660 src/_tags

View differences:

src/_tags
8 8
"main_lustre_compiler.native": package(ocamlgraph)
9 9
"main_lustre_compiler.native": use_str
10 10
"main_lustre_compiler.native": use_unix
11
<<<<<<< HEAD
12
<*.ml{,i}>: package(ocamlgraph)
13
<*.ml{,i}>: use_str
14
<*.ml{,i}>: use_unix
15
=======
16 11
"main_lustre_compiler.native": use_num, package(salsa)
12

  
13
#<*.ml{,i}>: package(ocamlgraph)
17 14
#<*.ml{,i}>: package(salsa)
18 15
<**/*.cm?>: use_graph
19 16
#<*.ml{,i}>: use_str
20 17
#<*.ml{,i}>: use_unix
21 18
<**/*.cm?>: package(salsa)
22
>>>>>>> salsa

Also available in: Unified diff