Permalink
Browse files

Merge remote-tracking branch 'nagn/fantasticgibs'

Conflicts:
	Source/gg2/Scripts/_resources.list.xml

This merge no change - all the changes were already cherrypicked into the xmas branch that was merged before. The merge is just supposed to visibly "close" this branch.
  • Loading branch information...
2 parents cf9c4d7 + c0e0b9d commit a346fb2504f6c829b8b70589e333a651e5e8e836 @Medo42 committed Dec 29, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit a346fb2

Please sign in to comment.