~cjdns-ppa/cjdns/+git/main:hyperboria-next

Last commit made on 2015-03-07
Get this branch:
git clone -b hyperboria-next https://git.launchpad.net/~cjdns-ppa/cjdns/+git/main

Branch merges

Branch information

Name:
hyperboria-next
Repository:
lp:~cjdns-ppa/cjdns/+git/main

Recent commits

eace571... by Lars

build: parse optimizeLevel from CFLAGS

36c67d1... by Lars

docs: remove resetAfterInactivitySeconds, pidFile, version

7d8dbd7... by Lars

Revert "doc: remove doc/ in preparation for git subtree-add"

This reverts commit 55c7f45824d9d78740ec15e1e30db51acf7e1f8e.

6f658cc... by Lars

Merge commit '1f62015d7f88eb0eb261df2e38bca34def674004' as 'doc'

1f62015... by Lars

Squashed 'doc/' content from commit 0eac5ce

git-subtree-dir: doc
git-subtree-split: 0eac5ce57ae559684cc0a3f5be5db46bc5b94b95

55c7f45... by Lars

doc: remove doc/ in preparation for git subtree-add

Conflicts:
 doc/TrafficAnalisys.md
 doc/Whitepaper.md
 doc/benchmark.txt
 doc/debugging_memory_leaks.md

de69126... by Lars

doc: move admin and tunnel readmes to doc/

9a7fbbc... by Caleb James DeLisle <email address hidden>

Merge branch 'master' of git://github.com/txpower/cjdns into crashey

42f24ee... by Caleb James DeLisle <email address hidden>

Merge branch 'patch-2' of git://github.com/Erkan-Yilmaz/cjdns into crashey

9a406fb... by Caleb James DeLisle <email address hidden>

Merge branch 'patch-3' of git://github.com/Erkan-Yilmaz/cjdns into crashey