From: inaka <inaka@tcrsnc.com>
Date: Sat, 24 Nov 2012 07:37:49 +0000 (+0900)
Subject: Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=75426bf03c07cfb6c9a89c3094be40d3be2e4258;hp=7b2821082fe39688047a804939be3d534c3882ec

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
---

diff --git a/更新履歴.txt b/更新履歴.txt
deleted file mode 100644
index b3e5f72..0000000
--- a/更新履歴.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-2012/11/24 ponkotate
-EAtomInfo‚ðXV
-EAuxiliary‚ðXV
-EChemiCraft‚ðXV
-EChemiCraftAPI‚ðXV
-ECompoundHandlerTest‚ðXV
-ECreativeTabAtoms‚ðXV
-EICompoundHandler‚ðXV
-EItemAtoms‚ðXV
-EItemCompounds‚ðXV
-EItemGasCollectingBottle‚ðXV
\ No newline at end of file