Commits

shuerhaaken  committed abf3ca5

checks and merges

  • Participants
  • Parent commits 8a24dd3

Comments (0)

Files changed (1)

+commit 8a24dd3da68e8d3457e8c907920799a8e3af6745
+Merge: 6f0caae 3743ce6
+Author: Jörn Magens <shuerhaaken@googlemail.com>
+Date:   Tue Oct 22 15:19:06 2013 +0200
+
+    Merge branch 'next'
+
+commit 3743ce6dd864fb0c8f05e660b9559c4b9d93e992
+Author: Jörn Magens <shuerhaaken@googlemail.com>
+Date:   Tue Oct 22 15:17:53 2013 +0200
+
+    changelog
+
 commit 5123b4e5e4667ba7d622983d16a0a7f5503f63b5
 Author: Jörn Magens <shuerhaaken@googlemail.com>
 Date:   Tue Oct 22 15:14:31 2013 +0200
 
     add doxygen documentation
 
+commit 6f0caae994e17d30706c4f280a91ebea289d4ddd
+Author: Jörn Magens <shuerhaaken@googlemail.com>
+Date:   Sun Sep 29 14:15:18 2013 +0200
+
+    add files for future opus test
+
 commit b623d0c27d6e3cf9b1ccc355335bb9c6b2f263ae
 Author: Jörn Magens <shuerhaaken@googlemail.com>
 Date:   Sun Sep 29 12:25:01 2013 +0200