Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt

1 files changed, 4 insertions, 0 deletions

diff --git a/bison.pri b/bison.pri
index 7d3bed0..9840c5a 100644
--- a/bison.pri
+++ b/bison.pri
@@ -22,6 +22,10 @@ unix:freebsd-g++ {
   QMAKE_YACC = /usr/local/bin/bison
 }
 
+unix:netbsd* {
+  QMAKE_YACC = /usr/pkg/bin/bison
+}
+
 unix:linux* {
   exists(/usr/bin/bison) {
     QMAKE_YACC = /usr/bin/bison