]> git.sesse.net Git - casparcg/commit
Merge pull request #138 from cambell-prince/master_parameters1
authorHellGore <helge.norberg@gmail.com>
Fri, 31 May 2013 12:18:56 +0000 (05:18 -0700)
committerHellGore <helge.norberg@gmail.com>
Fri, 31 May 2013 12:18:56 +0000 (05:18 -0700)
commit3722350707ab848cc35cff18d77f5ff9cd72e08f
tree5ba958f6fa18601725ed2e35a32c57f63db04f9c
parenta540c2296ee3bd20211cd838a6c121b1f03b8a65
parentfbce4ecebbc910dfcec88568b18fd82d1ad95f0f
Merge pull request #138 from cambell-prince/master_parameters1

Rebase parameters branch on current master.