| commit | 249ae147db3d0225e30d10958600fe71fc2ae253 | [log] [download] |
|---|---|---|
| author | Johannes Lohrer <johanneslohrer@msn.com> | Mon Sep 30 21:55:39 2013 +0200 |
| committer | Johannes Lohrer <johanneslohrer@msn.com> | Mon Sep 30 21:55:39 2013 +0200 |
| tree | 2ddee3d40b08b2d6a6251efe715c9f2f377f0b21 | |
| parent | a4546d00de340b642538369c4a148e85a2144f6b [diff] | |
| parent | b248174aba4f1aca9c591a2d6224eee8080cabd3 [diff] |
Merge branch 'master' of cil.li:oc Conflicts: li/cil/oc/common/tileentity/TileEntityComputer.scala added energy net integration to powersupply
