Skip to content

Commit

Permalink
Merge pull request #4 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history 
Merge from Master Copy
  • Loading branch information
@lilyclements
lilyclements authored Sep 15, 2016
2 parents b10d857 + 99984f6 commit 0aa3c04
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 16 deletions.
18 changes: 18 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,21 @@ FakesAssemblies/
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
/packages/unvell.ReoGrid.dll.1.2.3.0/tools/install.ps1
/packages/unvell.ReoGrid.dll.1.2.3.0/tools
/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20/unvell.ReoGrid.XML
/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20/unvell.ReoGrid.dll
/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20
/packages/unvell.ReoGrid.dll.1.2.3.0
/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.XML
/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.NativeLibrary.XML
/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.NativeLibrary.dll
/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.dll
/packages/R.NET.Community.1.6.5/lib/net40
/packages/R.NET.1.5.5/lib/net40/RDotNet.XML
/packages/R.NET.1.5.5/lib/net40/RDotNet.NativeLibrary.XML
/packages/R.NET.1.5.5/lib/net40/RDotNet.NativeLibrary.dll
/packages/R.NET.1.5.5/lib/net40/RDotNet.dll
/packages/R.NET.1.5.5/lib/net40
/packages/DynamicInterop.0.7.4/lib/net40/DynamicInterop.xml
/packages/DynamicInterop.0.7.4/lib/net40/DynamicInterop.dll
32 changes: 16 additions & 16 deletions instat/dlgAppend.Designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0aa3c04

Please sign in to comment.