diff options
author | Sven Gothel <[email protected]> | 2015-01-23 01:43:28 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-01-23 01:43:28 +0100 |
commit | cbdd310351f2eda837e707ba7fa9ac18ff9473e4 (patch) | |
tree | b65121432c2f0a4724a7d09bae933255ef59efcb /make | |
parent | 57dab52159394c2d7d48fe69417561e2f881b7a8 (diff) | |
parent | 55a5a2ccaf3a6a3ad220bef997343793d0f58756 (diff) |
Resolve merge conflict GLRendererQuirks
Diffstat (limited to 'make')
-rw-r--r-- | make/build-common.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index d0eb515e8..a601dc792 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -263,6 +263,7 @@ <path id="gluegen-gl.classpath"> <pathelement location="${gluegen.jar}" /> + <pathelement location="${antlr.jar}" /> <pathelement location="${gluegen-gl.jar}" /> </path> |