filux 509266e9a9 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	source/masterserver/flags/ad.png
	source/masterserver/flags/af.png
	source/masterserver/flags/ag.png
	source/masterserver/flags/ai.png
	source/masterserver/flags/al.png
	source/masterserver/flags/am.png
	source/masterserver/flags/ar.png
	source/masterserver/flags/as.png
	source/masterserver/flags/at.png
	source/masterserver/flags/au.png
	source/masterserver/flags/aw.png
	source/masterserver/flags/ax.png
	source/masterserver/flags/az.png
	source/masterserver/flags/ba.png
	source/masterserver/flags/bb.png
	source/masterserver/flags/bd.png
	source/masterserver/flags/be.png
	source/masterserver/flags/bf.png
	source/masterserver/flags/bg.png
	source/masterserver/flags/bi.png
	source/masterserver/flags/bj.png
	source/masterserver/flags/bm.png
	source/masterserver/flags/bn.png
	source/masterserver/flags/bo.png
	source/masterserver/flags/br.png
	source/masterserver/flags/bs.png
	source/masterserver/flags/bt.png
	source/masterserver/flags/bv.png
	source/masterserver/flags/bw.png
	source/masterserver/flags/by.png
	source/masterserver/flags/bz.png
	source/masterserver/flags/ca.png
	source/masterserver/flags/cc.png
	source/masterserver/flags/cf.png
	source/masterserver/flags/cg.png
	source/masterserver/flags/ci.png
	source/masterserver/flags/ck.png
	source/masterserver/flags/cl.png
	source/masterserver/flags/cm.png
	source/masterserver/flags/cn.png
	source/masterserver/flags/co.png
	source/masterserver/flags/cr.png
	source/masterserver/flags/cs.png
	source/masterserver/flags/cu.png
	source/masterserver/flags/cv.png
	source/masterserver/flags/cx.png
	source/masterserver/flags/cz.png
	source/masterserver/flags/de.png
	source/masterserver/flags/dj.png
	source/masterserver/flags/dk.png
	source/masterserver/flags/dm.png
	source/masterserver/flags/do.png
	source/masterserver/flags/dz.png
	source/masterserver/flags/ec.png
	source/masterserver/flags/eg.png
	source/masterserver/flags/eh.png
	source/masterserver/flags/er.png
	source/masterserver/flags/es.png
	source/masterserver/flags/et.png
	source/masterserver/flags/fi.png
	source/masterserver/flags/fj.png
	source/masterserver/flags/fk.png
	source/masterserver/flags/fm.png
	source/masterserver/flags/fr.png
	source/masterserver/flags/ga.png
	source/masterserver/flags/gb.png
	source/masterserver/flags/gd.png
	source/masterserver/flags/ge.png
	source/masterserver/flags/gf.png
	source/masterserver/flags/gh.png
	source/masterserver/flags/gl.png
	source/masterserver/flags/gm.png
	source/masterserver/flags/gn.png
	source/masterserver/flags/gp.png
	source/masterserver/flags/gq.png
	source/masterserver/flags/gr.png
	source/masterserver/flags/gs.png
	source/masterserver/flags/gt.png
	source/masterserver/flags/gu.png
	source/masterserver/flags/gw.png
	source/masterserver/flags/gy.png
	source/masterserver/flags/hk.png
	source/masterserver/flags/hm.png
	source/masterserver/flags/hn.png
	source/masterserver/flags/hr.png
	source/masterserver/flags/ht.png
	source/masterserver/flags/hu.png
	source/masterserver/flags/ie.png
	source/masterserver/flags/in.png
	source/masterserver/flags/io.png
	source/masterserver/flags/iq.png
	source/masterserver/flags/ir.png
	source/masterserver/flags/is.png
	source/masterserver/flags/jm.png
	source/masterserver/flags/jo.png
	source/masterserver/flags/ke.png
	source/masterserver/flags/kg.png
	source/masterserver/flags/kh.png
	source/masterserver/flags/ki.png
	source/masterserver/flags/km.png
	source/masterserver/flags/kn.png
	source/masterserver/flags/kp.png
	source/masterserver/flags/kr.png
	source/masterserver/flags/kw.png
	source/masterserver/flags/ky.png
	source/masterserver/flags/kz.png
	source/masterserver/flags/la.png
	source/masterserver/flags/lb.png
	source/masterserver/flags/lc.png
	source/masterserver/flags/li.png
	source/masterserver/flags/lk.png
	source/masterserver/flags/ls.png
	source/masterserver/flags/lt.png
	source/masterserver/flags/lu.png
	source/masterserver/flags/lv.png
	source/masterserver/flags/ly.png
	source/masterserver/flags/ma.png
	source/masterserver/flags/md.png
	source/masterserver/flags/me.png
	source/masterserver/flags/mg.png
	source/masterserver/flags/mh.png
	source/masterserver/flags/mk.png
	source/masterserver/flags/ml.png
	source/masterserver/flags/mm.png
	source/masterserver/flags/mn.png
	source/masterserver/flags/mo.png
	source/masterserver/flags/mp.png
	source/masterserver/flags/mq.png
	source/masterserver/flags/mr.png
	source/masterserver/flags/ms.png
	source/masterserver/flags/mu.png
	source/masterserver/flags/mv.png
	source/masterserver/flags/mw.png
	source/masterserver/flags/mx.png
	source/masterserver/flags/my.png
	source/masterserver/flags/mz.png
	source/masterserver/flags/na.png
	source/masterserver/flags/nc.png
	source/masterserver/flags/ne.png
	source/masterserver/flags/nf.png
	source/masterserver/flags/ng.png
	source/masterserver/flags/ni.png
	source/masterserver/flags/nl.png
	source/masterserver/flags/no.png
	source/masterserver/flags/np.png
	source/masterserver/flags/nr.png
	source/masterserver/flags/nu.png
	source/masterserver/flags/nz.png
	source/masterserver/flags/om.png
	source/masterserver/flags/pa.png
	source/masterserver/flags/pf.png
	source/masterserver/flags/pg.png
	source/masterserver/flags/ph.png
	source/masterserver/flags/pk.png
	source/masterserver/flags/pm.png
	source/masterserver/flags/pn.png
	source/masterserver/flags/pr.png
	source/masterserver/flags/pt.png
	source/masterserver/flags/pw.png
	source/masterserver/flags/py.png
	source/masterserver/flags/re.png
	source/masterserver/flags/ro.png
	source/masterserver/flags/rs.png
	source/masterserver/flags/ru.png
	source/masterserver/flags/rw.png
	source/masterserver/flags/sa.png
	source/masterserver/flags/sb.png
	source/masterserver/flags/sc.png
	source/masterserver/flags/sd.png
	source/masterserver/flags/se.png
	source/masterserver/flags/sg.png
	source/masterserver/flags/sh.png
	source/masterserver/flags/si.png
	source/masterserver/flags/sj.png
	source/masterserver/flags/sk.png
	source/masterserver/flags/sl.png
	source/masterserver/flags/sm.png
	source/masterserver/flags/sn.png
	source/masterserver/flags/so.png
	source/masterserver/flags/sr.png
	source/masterserver/flags/st.png
	source/masterserver/flags/sv.png
	source/masterserver/flags/sz.png
	source/masterserver/flags/tc.png
	source/masterserver/flags/td.png
	source/masterserver/flags/tf.png
	source/masterserver/flags/tg.png
	source/masterserver/flags/th.png
	source/masterserver/flags/tk.png
	source/masterserver/flags/tl.png
	source/masterserver/flags/tm.png
	source/masterserver/flags/tn.png
	source/masterserver/flags/tr.png
	source/masterserver/flags/tt.png
	source/masterserver/flags/tv.png
	source/masterserver/flags/tw.png
	source/masterserver/flags/tz.png
	source/masterserver/flags/ua.png
	source/masterserver/flags/ug.png
	source/masterserver/flags/um.png
	source/masterserver/flags/us.png
	source/masterserver/flags/uy.png
	source/masterserver/flags/uz.png
	source/masterserver/flags/va.png
	source/masterserver/flags/vc.png
	source/masterserver/flags/ve.png
	source/masterserver/flags/vg.png
	source/masterserver/flags/vi.png
	source/masterserver/flags/vn.png
	source/masterserver/flags/vu.png
	source/masterserver/flags/wf.png
	source/masterserver/flags/ws.png
	source/masterserver/flags/ye.png
	source/masterserver/flags/yt.png
	source/masterserver/flags/za.png
	source/masterserver/flags/zm.png
	source/masterserver/flags/zw.png
	source/masterserver/images/game_icon.png

2015-01-23 21:52:03 +01:00

..

mojosetup

Merge remote-tracking branch 'upstream/develop' into develop

2015-01-23 21:52:03 +01:00

.gitignore

Removed masterserver's code (separation from the source).

2014-03-27 20:12:04 +01:00

analyzeWorldSynch.sh

…

build-codeblocks-project.sh

- cleanup of cmake scripts and proper organizing of files

2014-01-21 23:21:56 -08:00

build-eclipse-project.sh

- cleanup of cmake scripts and proper organizing of files

2014-01-21 23:21:56 -08:00

build-mg-mingw.sh

- cleanup of cmake scripts and proper organizing of files

2014-01-21 23:21:56 -08:00

build-mg.sh

build-mg.sh: no more warning when clang is not installed [ci skip]

2014-02-15 02:38:42 +01:00

coverity-scan.sh

include more info in coverity build "description"

2014-11-10 09:39:19 +01:00

glest-dev.ini

- added more fields for dev path support.. onlu ico files for linxu left to fix

2014-01-24 17:51:06 -08:00

glest.ini

when compressing archives ignore svn files

2013-11-14 17:43:49 +00:00

make-binary-archive.sh

And another...

2014-09-25 02:22:57 +02:00

make-data-archive.sh

Merge remote-tracking branch 'upstream/develop' into develop

2015-01-23 21:52:03 +01:00

makedata-diff.sh

- missed some updates

2014-01-24 09:50:17 -08:00

makedata-source.sh

- missed some updates

2014-01-24 09:50:17 -08:00

makedata.sh

- update a few scripts to exclude cegui data

2014-12-29 17:23:20 -08:00

makedeps_folder.sh

…

makerelease-embedded.sh

All paths to flags probably are fixed now. & Removed 2 old scripts related with svn.

2014-03-27 20:26:01 +01:00

makerelease.sh

All paths to flags probably are fixed now. & Removed 2 old scripts related with svn.

2014-03-27 20:26:01 +01:00

megaglest_editor.desktop

some cleanup related to bugs filed on sourceforge from the Debian games team.

2013-11-03 04:10:20 +00:00

megaglest_g3dviewer.desktop

some cleanup related to bugs filed on sourceforge from the Debian games team.

2013-11-03 04:10:20 +00:00

megaglest-uninstall.ico

- cleanup of cmake scripts and proper organizing of files

2014-01-21 23:21:56 -08:00

megaglest.bmp

…

megaglest.desktop

some cleanup related to bugs filed on sourceforge from the Debian games team.

2013-11-03 04:10:20 +00:00

megaglest.png

lossless images compression

2015-01-14 23:58:30 +01:00

megaglest.xpm

…

mg_build_breakpad_stacktrace.sh

added scripts to produce google-breakpad symbols and produce a stacktrace from a dmp

2013-05-17 06:40:19 +00:00

mg_build_breakpad_symbols.sh

added scripts to produce google-breakpad symbols and produce a stacktrace from a dmp

2013-05-17 06:40:19 +00:00

mg_callgrind.sh

added profiler script

2013-06-12 06:44:23 +00:00

mg_cppcheck.sh

- added support for team unit sharing

2014-01-27 14:15:05 -08:00

mg_perf.sh

…

mg_shared.sh

introduce shared linux shell code / externalize distribution check

2013-12-26 18:28:21 +01:00

mg_valgrind.sh

updated menus to display translated tech name

2013-06-13 01:37:15 +00:00

mg-version-synch.sh

…

mg-version.sh

version set to 3.11.0

2015-01-20 23:10:36 +01:00

setupBuildDeps.sh

- updated deps for ubuntu 14.04 and higher

2014-11-29 22:45:31 -08:00

start_megaglest

fix for librtmp.so.0 missing

2014-11-02 22:26:38 +01:00

start_megaglest_g3dviewer

…

start_megaglest_gameserver

Add script to start a headless game server

2013-11-24 15:15:34 +00:00

start_megaglest_mapeditor

…

symbolstore.py

…