Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into sync/red-da…
Browse files Browse the repository at this point in the history
…tabase-github-mirror/master

* remotes/origin/master:
  update CMake , pcmet was removed (FirebirdSQL#61)
  • Loading branch information
GitLab committed Oct 28, 2016
2 parents 4f6d36b + 3cad8ab commit 18fd9b9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ set(epp_boot_gds_files
jrd/fun.epp
jrd/grant.epp
jrd/ini.epp
jrd/met.epp
jrd/pcmet.epp
jrd/met.epp
jrd/scl.epp
jrd/Function.epp
)
Expand Down Expand Up @@ -483,8 +482,7 @@ set(engine_generated_src
jrd/Function.epp
jrd/grant.epp
jrd/ini.epp
jrd/met.epp
jrd/pcmet.epp
jrd/met.epp
jrd/scl.epp
utilities/gstat/dba.epp
)
Expand Down

0 comments on commit 18fd9b9

Please sign in to comment.