diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-30 19:19:45 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-30 19:19:45 -0700 |
| commit | 52df59c55299419feb16a5daeed01389f4fafc73 (patch) | |
| tree | 5d081b9a9c14566c07cea8b661bf74acee0be312 /.gitignore | |
| parent | 9464504e4a68755296b96fcc3df4afe1ce79b681 (diff) | |
| parent | d3820049b82f756ba6c9c3390d4060ee1ad49925 (diff) | |
| download | infinitytier-52df59c55299419feb16a5daeed01389f4fafc73.tar.gz infinitytier-52df59c55299419feb16a5daeed01389f4fafc73.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -34,16 +34,10 @@ .qmake.stash *.autosave /ZeroTier One.dmg -/root-topology/*.secret -/testnet/local-testnet/n???? -/testnet/local-testnet/*/peers.persist -/testnet/local-testnet/*/authtoken.secret -/testnet/local-testnet/*/*.log -/testnet/local-testnet/*/*.old -/testnet/local-testnet/*/root-topology -/testnet/local-testnet/*/local.conf -/testnet/local-testnet/*/networks.d -/netconf/netconf.db +/root-topology/bin2c +/root-topology/mktopology +/root-topology/test/supernodes +/root-topology/test/test-root-topology java/obj/ java/libs/ java/bin/ |