Re: [brlcad-devel] OGV: GSoC'15

2015-08-13 Thread Deepak Sharma
On Thu, Aug 13, 2015 at 12:48 AM, Shubham Chauhan shubham13...@iiitd.ac.in wrote: @deepak: Can we meet on IRC about the project, anytime soon? Need to discuss about things that are left. Okay, I'll be there at 11:00 P.M IST -- Cheers! Deepak Kumar Sharma Guru Nanak Dev Engineering College

Re: [brlcad-devel] OGV: GSoC'15

2015-08-13 Thread Deepak Sharma
On Thu, Aug 13, 2015 at 2:42 PM, Deepak Sharma deeky.sha...@gmail.com wrote: Okay, I'll be there at 11:00 P.M IST Waiting for you. -- Cheers! Deepak Kumar Sharma Guru Nanak Dev Engineering College India! Blog: http://deekysharma.wordpress.com

Re: [brlcad-devel] Documentation system feedback

2015-08-13 Thread Hitesh Sofat
On Fri, Aug 14, 2015 at 12:48 AM, Shaina Sabarwal iamshainasabar...@gmail.com wrote: On Thu, Aug 13, 2015 at 3:55 AM, Christopher Sean Morrison brl...@mac.com wrote: Hi All, Hitesh has made a lot of really good progress on the documentation website, working behind the scenes on many change

Re: [brlcad-devel] Documentation system feedback

2015-08-13 Thread Shaina Sabarwal
On Thu, Aug 13, 2015 at 3:55 AM, Christopher Sean Morrison brl...@mac.com wrote: Hi All, Hitesh has made a lot of really good progress on the documentation website, working behind the scenes on many change requests / fixes that I’ve been battering him with. It’s coming to a stable point,

Re: [brlcad-devel] [OGV] Merge Front and Back End branches

2015-08-13 Thread Deepak Sharma
On Sun, Jul 26, 2015 at 4:51 PM, Deepak Sharma deeky.sha...@gmail.com wrote: @Inderpreet I am facing merge conflicts in following files OGV/.meteor/release: needs update OGV/.meteor/versions: needs merge I updated these files according to my local files and then tried, git add but still