Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merging conflicts

Browse source 
--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-07-07 01:57:08 +05:30
commit edfe73b1ec
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/.plugincache.php.swp Normal file
View file

Binary file not shown.

2
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
View file

@ -1,4 +1,4 @@
<?php <?php
/** /**
* API for loading and interacting with plugins * API for loading and interacting with plugins