Merge branch 'origin/master'

hivesolutions · Aug 10, 2015 · a46fe6f · a46fe6f
2 parents ea3756f + 5099a88
commit a46fe6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nanger/src/nanger/resources/extras/libs/layout b/nanger/src/nanger/resources/extras/libs/layout
diff --git a/nanger/src/nanger/resources/extras/libs/uxf b/nanger/src/nanger/resources/extras/libs/uxf