Merge branch 'develop'

erengy · Jun 20, 2014 · 39a73c9 · 39a73c9
2 parents ee9b3e5 + 2c2df4b
commit 39a73c9
Show file tree

Hide file tree

Showing 393 changed files with 79,656 additions and 58,426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+bin/*
+build/*
+deps/lib/*
+
+project/vs*/ipch
+project/vs*/*.opensdf
+project/vs*/*.sdf
+project/vs*/*.suo
+project/vs*/*.user
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -0,0 +1,5 @@
+# Taiga
+
+Taiga is an open source, lightweight, anime tracker for Windows. It can automatically detect the episodes you're watching on your computer and synchronize your progress with online services such as [Hummingbird](http://hummingbird.me) and [MyAnimeList](http://myanimelist.net). It helps you manage your list, discover new series, share watched episodes and download new ones.
+
+Visit our [home page](http://taiga.erengy.com) for more information. See the [guidelines](https://github.com/erengy/taiga/wiki/Guidelines) if you'd like to contribute. Here's [how to compile](https://github.com/erengy/taiga/wiki/How-to-Compile).
diff --git a/Taiga.vcxproj b/Taiga.vcxproj