merged from dev-master, now we are almost ready for release 0.2.0

cn-uofbasel · Dec 23, 2014 · 5fd9518 · 5fd9518
1 parent 3894036
commit 5fd9518
Show file tree

Hide file tree

Showing 56 changed files with 4 additions and 7,608 deletions.
diff --git a/credits.md → doc/credits.md b/credits.md → doc/credits.md
diff --git a/src/Makefile b/src/Makefile
@@ -15,7 +15,8 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 CC?=gcc
 
 # general flags used on both linux and OSX
-CCNLCFLAGS=-Wall -Werror -pedantic -std=c99 -g -O0
+# CCNLCFLAGS=-Wall -Werror -pedantic -std=c99 -g -O0
+CCNLCFLAGS=-Wall -pedantic -std=c99 -g -O0
 
 # Linux flags
 LINUX_CFLAGS=-D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -Dlinux 

diff --git a/src/omnet/.cproject b/src/omnet/.cproject
diff --git a/src/omnet/.nedfolders b/src/omnet/.nedfolders
diff --git a/src/omnet/.oppbuildspec b/src/omnet/.oppbuildspec
diff --git a/src/omnet/.project b/src/omnet/.project
diff --git a/src/omnet/.settings/org.eclipse.cdt.codan.core.prefs b/src/omnet/.settings/org.eclipse.cdt.codan.core.prefs