Re: [O] [GSoC] Org Merge Driver Update

2012-08-25 Thread Simon Thum
Hi Andrew, I finally got to code a bit and tried clang on the merge driver. BTW you should probably mention prerequisites like gcc 4.7. clang suggests your syntax is C11/requires a c++-style ODR. Also there is one error and numerous warnings you might want to fix. HTH, Simon clang -DHAVE_

Re: [O] [GSoC] Org Merge Driver Update

2012-08-18 Thread Andrew Young
Hello Simon, On Fri, Aug 17, 2012 at 10:09 PM, Simon Thum wrote: > Hi Andrew, > > sorry to report less exciting things. I could not compile - the repo > contains two invalid links into my system: > > lrwxrwxrwx 1 simon users38 Aug 18 04:01 tap-driver.sh -> > /usr/share/automake-1.12/tap-drive

Re: [O] [GSoC] Org Merge Driver Update

2012-08-17 Thread Simon Thum
Hi Andrew, sorry to report less exciting things. I could not compile - the repo contains two invalid links into my system: lrwxrwxrwx 1 simon users38 Aug 18 04:01 tap-driver.sh -> /usr/share/automake-1.12/tap-driver.sh lrwxrwxrwx 1 simon users36 Aug 18 04:01 test-driver -> /usr/share

Re: [O] [GSoC] Org Merge Driver Update

2012-08-16 Thread Eric Schulte
Andrew Young writes: > Hi, > On Wed, Aug 15, 2012 at 1:04 PM, Eric Schulte wrote: >> I'm very excited to start using this merge driver. I've put together an >> Arch Linux User Repository (aur) package, which can be used by Arch >> Linux users to install the org-merge-driver with pacman. It is

Re: [O] [GSoC] Org Merge Driver Update

2012-08-16 Thread Andrew Young
Hi, On Wed, Aug 15, 2012 at 1:04 PM, Eric Schulte wrote: > I'm very excited to start using this merge driver. I've put together an > Arch Linux User Repository (aur) package, which can be used by Arch > Linux users to install the org-merge-driver with pacman. It is > available at [1], Thank you

Re: [O] [GSoC] Org Merge Driver Update

2012-08-15 Thread Rasmus
Eric Schulte writes: > I'm very excited to start using this merge driver. I've put together an > Arch Linux User Repository (aur) package, which can be used by Arch > Linux users to install the org-merge-driver with pacman. It is > available at [1], if others find it useful and if Andrew doesn'

Re: [O] [GSoC] Org Merge Driver Update

2012-08-15 Thread Bastien
Eric Schulte writes: > I'm very excited to start using this merge driver. I've put together an > Arch Linux User Repository (aur) package, which can be used by Arch > Linux users to install the org-merge-driver with pacman. It is > available at [1], if others find it useful and if Andrew doesn'

Re: [O] [GSoC] Org Merge Driver Update

2012-08-15 Thread Eric Schulte
Andrew Young writes: > Hello Everyone, > > I've been working on a merge driver for org-mode documents over the > summer as a Google Summer of Code project. I just wanted to show > everyone some progress on the merge driver. > > There are some new examples you can see at the project page [1][2], a

[O] [GSoC] Org Merge Driver Update

2012-08-13 Thread Andrew Young
Hello Everyone, I've been working on a merge driver for org-mode documents over the summer as a Google Summer of Code project. I just wanted to show everyone some progress on the merge driver. There are some new examples you can see at the project page [1][2], and instructions on how to build and