Mercurial > mxe-octave
view .gitignore @ 2766:d733a98b84d6
Merge branch 'stable'
Conflicts:
src/qt-1-cherrypicks.patch
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Thu, 20 Sep 2012 10:43:06 +0200 |
parents | 8db5a297f243 |
children |
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Thu, 20 Sep 2012 10:43:06 +0200 |
parents | 8db5a297f243 |
children |