Commit Graph
2 Commits
Author SHA1 Message Date
Ruben S. Montero b84a0350a7 Merge branch 'feature-1739'
Conflicts:
	src/common/NebulaUtil.cc
	src/common/SConstruct
2013-02-17 00:07:07 +01:00
Javi Fontan 1a712ed5a7 Change Util.h to NebulaUtil.h
In MacOS X Util.h caused problems compiling tty_expect as the filesystem
is not case sensitive by default and there is a /usr/include/util.h.
2013-02-12 12:15:09 +01:00