labofsahil/github-event-dataset-2012 huggingface dataset:
Changed 'autoload' to 'yui_modules' in documentation.
Changed directory name from 'autoload' to 'yui_modules' for the YUI modules example.
Merge pull request #821 from zhouyaoji/docs_autoload_to_yui_modules

[docs] Changed the autoload directory to yui modules directory, but left notes that both can be used.
[fix issue 352] archetypes now specify a version of mojito similar to that which uses them
Merge pull request #355 from drewfish/i352-archetypes

[fix issue #352] archetypes now specify a version of mojito similar to that which uses them
Se remueve hoja en blanco
apply the Data.Text.Search searching code to the wai findBound function for a significant speedup
comment out the exports as well as the test functions
use stringsearch instead of borrowing from Data.Text
pull out -O2; it no longer makes any difference
Network.Wai.Search is no longer part of the repo; pull it out of the .cabal as well
put in version restrictions
negative bytestring indices are bad; put a floor of 0 under them to preserve the original behaviour
Merge pull request #84 from tsuraan/master

wai-extra form processing speedup
improve spec
minor fix
improve add objects
improve
localized country
more localization
add i18n
add icon
localize
Add task
finish task
Improve
Added Y to predef
Moving to jshint instead of jslint
Added travis config
Exported closedumps to Python.
Very simple implementation of shell execution by Python.
Add support for iOS auto-focus in standalone webapps
Use proper versioning for NPM.
new gtest set
0 is a valid number of io_threads (inproc-only)
remove duplicate `send_unicode = send_string`

introduced by bad merge
Add auto Makefile generation tasks and template
Editor 模块修订，规范变量名。
add fp info
rename ServerState.t to GameState.t
working to make nuke a context/container provider
Use UTF-8 in Ruby
add env vars for source file for heroku
update test runner
Merge branch 'master' of https://github.com/1334/dotfiles

Conflicts:
	bash/bashrc
Fixed TextExpand event in Workbench
0000672: Loading Example Drawing extraction crashes at Baseclass.cpp line 115
Sketcher: small fix in listing of conflicting constraints
0000671: Crash with Draft/Put... on sheet with PartDesignExample.FCStd
Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad
0000673: BSplineSurfacePy::insertVKnots manipulates UKnots
Removed plg files
Reverted dumb change made while testing win issue with NaN arrays
Simple QML update
Merge branch 'master' of github.com:AIFDR/inasafe
Added lines of code metric to Makefile - needs apt-get install sloccount
Merge branch 'master' of github.com:AIFDR/inasafe
Moved TESTDATA, HAZDATA and EXPDATA to safe_api
Moved nanallclose to common numerics area
Removed unused code titelize
Comments
Moved tables to common area
Moved dynamic translation module to common
Moved polygon and its test to common. Not yet fixed rest of InaSAFE
Fixed InaSAFE for new polygon location
Updated InaSAFE to use interpolation in common area
Moved high level vector/raster interpolation to storage - all 213 tests pass
Removed references to riab
Created bit.ly/inasafe-install and updated docs
Added sha and timestamp to lines-of-code
Created common superclass for raster and vector layers.
Moved duplicated code into superclass
Updated translations according to advice from Radhiet
More testing leading to issue #344
Initial commit
click and repeat
...
...
...
...
Merge branch 'master' of https://github.com/Aabd/C-Source

Conflicts:
	README.md
kay
modified 1-3 no talkie boxes
intro, setup stuff
Merge pull request #5 from Adman/master

ConfigParser -> RawConfigParser
New about Stellar Message Box
dont save project to stellar folder
Merge branch 'master' of git://github.com/Coppolaemilio/stellar
added folder browsing
Works with example from book
adds back in the form reference
update LC3 checks to allow -A .A A. A- in a name, e.g., Series-A, A-list,
etc.
* SqliteHelper is working
Making mincbeast more novice user friendly
Added 10 ICBM subjects database at 2&4 mm resolution only
added proper -clobber handling
Added installation of free_database
very minor change
Trying to fix MySQL error
merging
Debugging travis MySQL error
Debugging travis MySQL error
Debugging travis inclusion error
Debugging travis inclusion error
Debugging travis inclusion error
Debugging travis inclusion error
[FIX] XQuery: util:sleep() was pre-evaluated
[FIX] GUI: printing output of db:output()
Removing the head from z-minigame
Signed-off-by: Butcher0 <arevenes@gmail.com>
Xair styrt av cos/sinus .. mislykka
Med kontroller for crosshair, tatt vekk testkontroller (digital)
Searcher prints search results to the screen.
Merge branch 'master' of git://github.com/CLao/BitNomen.git
agregado decimal plugin
Pass test. Missing new test
QUASAR: shift interface aliases table beneath input section, add h1
Update projects to comply with sonatype's requirements for hosting in the central repository.
Added sonatype parent for repository definitions.
Merge pull request #24 from jimfcarroll/sonatype-prep

Update projects to comply with sonatype's requirements for hosting in th...

closes #21
added monkey example
Missed a few things
More missed things
GUI pakeitimai.
Procesu ir Resoursu tables atskirai.
Nuskaitom programa.
Added Fall 2012 classes.

6.172, 6.034, 6.046, 21M.605
Fix portfolioAnchors links in our portfolio
Version 2.1.5
avutil: skip old_pix_fmts.h since it is just a list
doc: allow building with old texi2html versions

Signed-off-by: Mans Rullgard <mans@mansr.com>
rtpdec_vp8: Make the depacketizer implement the latest spec draft

Not all details are implemented, but it's enough for proper
playback as long as there is no packet loss.

Tested to work with the packetizer in gstreamer (which although
uses a different codec name, to clarify that it is still a spec
draft).

Signed-off-by: Martin Storsjö <martin@martin.st>
rtpenc_vp8: Update the packetizer to the latest spec version

Tested to work with the gstreamer depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
build: add -Mdse to PGI optimisation flags

Enable dead store elimination.  The last few releases work no worse
with this flag than without.  Older versions failed to build some
source files when using this flag.

Signed-off-by: Mans Rullgard <mans@mansr.com>
build: add LTO support for PGI compiler

Signed-off-by: Mans Rullgard <mans@mansr.com>
ppc: fix Altivec build with old compilers

The vec_splat() intrinsic requires a constant argument for the
element number, and the code relies on the compiler unrolling
the loop to provide this.  Manually unrolling the loop avoids
this reliance and works with all compilers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
file: Set the return value type for lseek to int64_t.

This fixes a regression in 4ed5ac5.

Signed-off-by: Martin Storsjö <martin@martin.st>
rtp: Support packetization/depacketization of opus

Signed-off-by: Martin Storsjö <martin@martin.st>
Restructure av_log_missing_feature message

Some invocations include a verb in the log message, others do not.  Yet
av_log_missing_feature expects callers to provide a verb.  Change the
function to include a verb instead and update the callers accordingly.
The result is a more natural function API and correct English in the
function invocations.
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS

This was done to work around toolchain bugs that have long been fixed.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
  Restructure av_log_missing_feature message
  rtp: Support packetization/depacketization of opus
  file: Set the return value type for lseek to int64_t.
  ppc: fix Altivec build with old compilers
  build: add LTO support for PGI compiler
  build: add -Mdse to PGI optimisation flags
  rtpenc_vp8: Update the packetizer to the latest spec version
  rtpdec_vp8: Make the depacketizer implement the latest spec draft
  doc: allow building with old texi2html versions
  avutil: skip old_pix_fmts.h since it is just a list

Conflicts:
	libavcodec/aacdec.c
	libavcodec/h264.c
	libavcodec/ppc/fmtconvert_altivec.c
	libavcodec/utils.c
	libavformat/file.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Check resync marker only when enabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Check for resync marker based on vop coding type- vop_fcode_forward and vop_fcode_backward L

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi: update some deprecated functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
diracdsp: try to fix segfault

This might fix Ticket1412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
added DateTime.new(Num) wrapper (Num->Int)
Correction sur la partie cliente. Génération dans le folder
src/main/java. 
faire un include to build path sur le répertoire qui est générée et qui
contient les *.java généré. 

Signed-off-by: fabyle <fabien99@gmail.com>
fixes job worker when inittab gives error "process field too long"
german keyboard layout
improve SSL key size to 2048 bits
Final version of the strucrure. Some variables need to rename. That's all.
fucking outputs
Commited with an error in the ruby code

I was trying to "translate" the code from java to ruby for hell of alot
of time ,but there is still 1 minor error in the code. (I don't know how
to break the first for loop{There is no logical way to break the fist
for loop ...})
values(NamedVector) and find(NamedVector, value)

values() gives the underlying array values
find() gives the position of the value in the array, or 0
sort dir entries correctly
Controls now appear in the order they were listed.

Controls now appear from top to down in the order
they were listed in their yaml file. Order can
also be overwritten through field 'position'
in their yaml. ZoomIn uses this approach as an
example.
working on getting user location from ip
Android toolchain: libstdc++ and libsupc are removed from explicit link libraries

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   android/android.toolchain.cmake
#
Fix gcc build errors and warnings
refining css and animation
Remove other shit agayn
enable site deployment only on release.  enable link checking only when requested
in the emitted javadoc, use a JADT link that linkcheck won't object to
can't ignore java-gen until that stuff is generated by the build
add documentation about the lack of custom methods
use an error ADT instead of exceptions in the semantic checker
shh, I smell dead code
never name a package 'target.' ever.
Removing redis log keys when job is removed
Export remove function for events
Removing an event from the events Job map at job.remove(), not when any
message is emitted other than "progress"
refactor execution plugins packaging
fix startup scripts generation
starting to work with FOS User bundle
made other changes on master
Added a new footer [issue 53]
Fixed default assignment of username at constructor class
finished the new footer[issue 53]
Merge branch 'iss53'
New change [issue 54]
Finish change [issue 54]
Update line 10
Merge branch 'iss54'

Conflicts:
	src/com/juniorsrr/web/Login.java

Conflicts solved.
[cleaup] update
Extracted the schema editor into it's own user control
Ninja: add option to enable ninja where it is not enabled by default
Merge topic 'ninja-fix-plugin-test' into next

f93e818 Ninja: add option to enable ninja where it is not enabled by default
Merge topic 'fix-12621-xcode43'

0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621)
4693cf8 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)
Merge topic 'write-cache-atomically'

9eb8e4b Write CMakeCache.txt atomically (#13040)
Merge topic 'CPack-fixSTGZpermission-bug13046'

4576f40 CPack STGZ put execute permission on all packages files (component case)
Merge topic 'CPack-fixCPACK_MONOLITHIC_INSTALL-handling'

805c1b2 Handle CPACK_MONOLITHIC_INSTALL in some rare use cases.
Merge topic 'find_package_set_FOUND_VariableInConfigFile'

0cf8447 find_package: additional test for checking the error message
56ae3f9 find_package: add test for setting Foo_FOUND to FALSE in a Config file
16c0c73 find_package: allow <pkg>Config.cmake to set <pkg>_FOUND to FALSE
add missing file List-Get-CMP0007-Warn.cmake
Merge topic 'start-contributing-irc-session' into next

9576954 add missing file List-Get-CMP0007-Warn.cmake
list: add tests for CMP0007 behavior
Merge topic 'start-contributing-irc-session' into next

49bd94a list: add tests for CMP0007 behavior
Added ConqueTerm
Drop entry from known_files if it's ignored by anidb

This means that valid files that don't have anidb entries yet will
always be rehashed, but this also means that we don't depend on
update_mylist_state_for_missing_files to accidentally keep known_files
sane.
Merge branch 'feature/forget_on_ignore' into pu
Set anime_is_ongoing variable if the ending year isn't set
Merge branch 'feature/is_ongoing' into pu

Conflicts:
	kadr.pl
Moved global config to new file
Add reserve.json. Release 0.3.
LKUpdateOlc should be executed only at 1Hz. Being called by RenderMapWindow, upon fast zoom or fast clicks it was called at more than 1hz.
Update changes
Fix Last Commit : Crash in Pan Mode... ( build with mingw32 4.7.0)
Merge branch 'Pan-Crash' of http://github.com/brunotl/LK8000
small edit of header handling in Cookie
Pertubação com erro no metodo pertubarColuna os outros estão ok
Start migration domain versions map to a different thrift field.
put colour and thrust sliders into grids at the bottom
properly create and destroy the slider as required
public interface to change the scroll position
grid the main ui and use a multilinetext for the log
add headings and spacing on the sliders to try and get a little consistency
Separate station definitions from the model files
Create definitions for all usable stations
Merge branch 'new-model' into separate-station-defs

Conflicts:
	src/NewModelViewer.cpp
	src/NewModelViewer.h
Allow Models instead of LMRModels with stations
Merge branch 'separate-station-defs' into pioneer-diet
the application scaffold is up :)
Removing old submodule repos
fixng
fixng
Shrinking status window.
added /.nuget/nuget.exe to .gitignore
fixed *.publish.xml files
nansum,nanmean,nanasum2
second attempt to solve the rem_2pi problem in extended computation mode
Fix for Issue #168.

 * disp(x) call operator<< without any fancy name prepending. See : http://www.mathworks.fr/help/techdoc/ref/disp.html
 * display({n},x) prints out the name n then x using name prepending + pretty printing + operator<<. See http://www.mathworks.fr/help/techdoc/ref/display.html
 * NT2_DISP becomes NT2_DISPLAY
 * All file using these have been amended
Merge pull request #190 from MetaScale/display

Fix for Issue #168.
tri1l tri1u and band following the relative model
merging master in algebra
using triu tri1l in factorizations
comparison of simd indices made on integer types
updated algebra to master
Merge branch 'algebra' of github.com:MetaScale/nt2 into algebra
Extra polish concerning makefiles and UI files
Windows.Test is now a real XNA project with proper content pipeline.
Some more work on OSX version.
Updated submodule.
Local changes .. part os OSX. but covers core libs.. may need to revert because these are old.
No idea why it is forcing me to do this...
Merge branch 'master' of https://github.com/My64K/TheGame
Fixed my project files.
Need tho do something about the Unix vs Windows CRLF issues…
Merge branch 'master' of https://github.com/My64K/TheGame
Finish removal of 'card' in Ceton config.
Added "New" dialog

Added dialog for creating a new statistic in two ways: initialized with
same value and entered from keyboard.
Added MainWindow::setStatistic
Separated parsing from Reader into Reader::Parser and reused.
Update master
Merge pull request #216 from marcofax/patch-35

tradotto
Corrette righe mancanti.
Aggiunta trad. ing.
Merge pull request #942 from max2348/patch-46

Aggiunta trad. ing.
Tradotto da Marchetto e corretto da me
temporary allow changing comands during tomorrow's contest
remain encoder providers
Added basic orientation handling for WP8
- openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0
 - add myself as a maintainer for the packages I've added
 - zfs-0.6.0-rc11, and spl-0.6.0-rc11
 - remove old versions
Revert " - remove old versions"

This reverts commit 65d3ef369e6657cc04dc1d9ac6d9837092b617aa.
Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11"

This reverts commit 8eb9491a22cd57415ba10470b7c7950e712ec4c0.
 - zfs 0.6.0-rc11, spl 0.6.0-rc11
 - clean up openttd, rili, uqm, and widelands descriptions
 - removing old spl/zfs versions
 - Make rili work with new autoconf versions
 - Make rili work with new autoconf versions
 - on a bumpy path from hg to git..
Merge remote-tracking branch 'upstream/master'
Add jhc 0.8.0
Merge remote-tracking branch 'upstream/master' into jhc
Upgrade firmware-linux-nonfree to 0.36, because the last version disappeared from the Debian mirrors.
Remove phat

Phat was only used by Specimen, which has been replaced by Petri-Foo. Petri-Foo dropped the dependency on Phat, so it is no longer being used at all, and it also fails to build.
distrho: fix HybridReverb2
linux: Update to 3.2.31
adding taskwarrior
git: update to 1.8.0.1
git-annex: update to 3.20121126
Removing the 2.6.39 kernel from release-cross; it wasn't in nixpkgs.

I add linux 3.6.
git-annex: update to 3.20120624
git-annex: update to 3.20120629
Add directory support for libretro_path/-L.
Fix Win32 build.
Fix set_savestate_auto_index.
Merge pull request #53 from OV2/master

Current monitor for regular fullscreen (WGL).
Fix compiler warnings.
Addition to AUTHORS.
win32: selectable monitor in wgl context
tap fixed and leavearea/enterarea balanced
Bug preventing ALT key from appear solved
Bugfix: removed warnings. #365
Lower default threads to 2
Use perimeter length, not area, to detect small perimeters. #355
Add an envvar to prevent deps from being installed

It's optional and defaults to off but people can set it if they would
like to install the dependencies in a different way.
Merge pull request #371 from shlomif/master

Add an env var to prevent the Build.PL from installing dependencies.
Don't rearrange plate upon object rotation
Merge remote branch 'upstream/master' into bench
Restore 100% flow for support material
Merge remote branch 'upstream/master' into bench
Wrap some of the sceUmd* HLE functions.

Intentionally skipped unimpl funcs.  Also skipped sceUmdCheckMedium
because docs online said it takes no param, but code says it does.
Cleanup sceCtrlSetSamplingMode.

Use constants, assert expected param range, wrap.
Update pspautotests
Merge remote-tracking branch 'origin/master'
Wrap a few sceCtrl* funcs.

Also add an assert, seems like if nBufs = 0, could cause a bug.
Merge remote-tracking branch 'upstream/master'
Merge pull request #37 from unknownbrackets/master

Add a few minor wraps and asserts
TeamCity test report integration
Corrected bits of text because GL_QUADS is deprecated.
[331] Fixed up some method names that escaped refactoring.
Updates to ElevationMetadataProvider.
Revert "added fullscreen test"

This reverts commit 8379f80cd7b54401fbff1c79bef1574217a05608.
Revert "fixed geometry mask, nested still won't work"

This reverts commit ba01c660a5da8c4896646dc81db68bab504ad357.
Revert "Revert "fixed geometry mask, nested still won't work""

This reverts commit f7a2cd73a04b06dea352625040c778c5ca6ac908.
Revert "Revert "added fullscreen test""

This reverts commit c867f2375e627aac5955d1082f860ebda3360b52.
fixed issue with GL_ALPHA textures
Registro usuario Nativo
optimize handling startup tabs
fix typo
BF: Allow for --pylab=inline to have effect in tutorial session
Splitted SQL Library in sql, sql-bonecp, sql-c3p0, sql-dbcp and sql-liquibase
Merge branch 'feature/Split_SQL_Support' into develop
working towards PUT
Merge branch 'master' of https://github.com/RRutsche/MME2
update
Merge branch 'master' of https://github.com/RRutsche/MME2
upload button
added 2010 values
Merge branch 'gh-pages' of github.com:RWMaps/rw-drc into gh-pages
Correção em alguns NPCs
Correções em algumas habilidades de Kagerou
Correções na DB

Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
Corrigido pequeno problema na skill_db.txt

Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
Merge pull request #2 from Cronus-Emulator/master
completed user microposts and upto chapter 10
RAXAJSS-538 .  Update New Patient Registration Form in Screener. 
Merge pull request #257 from SidhiAgarwal/RAXAJSS-538

RAXAJSS-538 .  Update New Patient Registration Form in Screener.
RAXAJSS-57 & RAXAJSS-244 & RAXAJSS-265
added chw.png and encounters.js fixed git case error 2
resolved conflicts
merged changes from shivam's code
resolving conflicts
corrected some issues
improved the code
Merge pull request #131 from tushar-bansal/secondary

RAXAJSS-265 & RAXAJSS-244 & RAXAJSS-57
Update xbmc/pvr/timers/PVRTimers.cpp
Music Scanner Bugfix

1. Bugfix: Music scanner did not correctly load the image artwork for directories with more than 1 album (i.e. "Singles" directories).  Now it does.
pvr: improved german translation
fixed: too many ALSA audio devices enumerated on Ubuntu

Ubuntu has patched their alsa-lib so that "defaults.namehint.extended"
defaults to "on" instead of upstream "off", causing lots of unwanted
extra devices (many of which are not actually routed properly, like the
"dmix:$foo" ones which may actually direct to a completely different
device) to be found by the enumeration process.

Skip such devices.
fixed: do not replace ALSA card name with device name as last resort

If multiple enumerated ALSA devices share the same card id and logical
device number, currently the card name is replaced with the raw device
name.

Instead of replacing the card name, append the raw device name to the
displayName.

Note that these kind of devices are not normally encountered.
confluence: epg start/end time before/after progress bar within channel
osd and date time added to the header of the channel osd
[cosmetic] - remove whitespaces
fixed, do not assume videoplayer.synctype is valid without first checking videoplayer.usedisplayasclock
changed: minimize URL.h header pollution
changed: minimize IFile.h header pollution
changed: minimize Temperature.h header pollution
changed: minimize LangInfo.h header pollution
changed: minimize GUIInfoManager.h header pollution
changed: remove unnecessary includes
Merge pull request #1210 from cptspiff/lessdeps

lessen interdependencies - more of this crap
cosmetics: fixed some warnings
Cosmetic: Fixed typo being placed in log
Cosmetic: Fixed typo being placed in debug log
Fixed: g_windowManager used a reference to itself

c/p artifact from 6e1a053071380 by he who shall remain nameless ;-)
pvr: fixed - typo in 4e72ffee1177838765917cca1c663121e9319f9c that made channel down do a channel up instead
Added some points to Tech Environments

Wwill add more tomm....
Correctif pour plus de visibilité
Correction to logic for port range in slurm.conf node configuration
Forgot to add new html file in last commit
Add missing semicolon so code will compile when HAVE_READLINE is false
Merge pull request #35 from rhc54/master

Fix broken build when HAVE_READLINE is false
Finished (i hope) proof of covariant-cdR vs ucdR
playground test classes added.
Planungsphase ShopButton
Allow up/down and left/right to resolve using row/cell methods
Use locally provided gc headers.
(cherry picked from commit 198aebba5ecb6b327c8477bb5ed106a8e6163013)
Replaces Zend\View\Helper\Escape with new Zend\View\Helper\EscapeHtml
Added helpers for other escaper functions
Updated View Helpers to use new Escaper class & supporting helpers
Initial work towards updating Zend\Form view helpers to use Zend\Escaper
Incorrect class name for EscapeUrl helper. Everyone has a Homer day...
Added test case for EscapeHtmlAttr and revised class name correctly
Change name of escape plugin in test case
Use escapehtml instead of escapehtmlattr for quoted attribute values
Added tests for CSS, JS and URL escape helpers - basic clones of original just to check workflow
Merge pull request #3 from adamlundrigan/feature/zend-form-with-escaper

Feature: Use new escape view helpers in Zend\Form\View\Helper
CS: Replace tabs in Escaper\AbstractHelper (ST2 default fail)
Updated Exception message for clarity
Minor refactor of Escape helper recursion into parent AbstractHelper
Minor fixes required to get the DependencyInjectorProxy to work
Adding minor todo to remind about moving some code to servicelocator namespace
Enabling tests for code generator again, since it has been updated
Fixing DependencyInjectorProxy to avoid executing resolveAndCallInjectionMethodForInstance on non-proxy instancesAlso, allowing override of usage of get_class in Zend\Di\Di. This allows more flexibility when extending it
Documenting code for GeneratorInstance, allowing string callbacks in DependencyInjectorProxy, fixing instance name when an instance is generated via callback
Cleaning up documentations and marking utility method  as internal to warn potential users
Merge branch 'hotfix/di-code-generator-fixes-rebased' of https://github.com/Ocramius/zf2 into hotfix/di-generator
Overhauls units; adds some terrain

Units now have a movement type, fitting with the Advance Wars spec
Movement costs are, appropriately, handled by the source rather than the unit description
CWE_terrain now contains a pipe seam class and a pipe object (as well as a typo correction), which should hopefully work out of the box.

Signed-off-by: TVilece <timothy.vilece@ncf.edu>
Merge branch 'HEAD' of git@github.com:SoobNauce/CWE.git
Add rewrite, working groups
Made the readme better...
Add label format for legend
Fix stream order issue
Update build script, create build folder automation
Merge pull request #76 from JacksonTian/butterfly

编译时自动创建build目录。
Fix column bug
Merge branch 'butterfly' of git://github.com/TBEDP/datavjs into butterfly
Fix d3 bug
Merge branch 'butterfly' of git://github.com/TBEDP/datavjs into butterfly
Add formatter
Add legend option
Refine column & bubble
Merge pull request #85 from JacksonTian/butterfly

Fix气泡图bug & 重构Column图
Adding seleniumdriver tests to travis.
Listo el modo singleton para el PersonalDeLimpieza
SD2 renew
[mr2013] add internal map locking to direct operations with map objects store. related to #941, testing. may cause freezes.
[mr2014] implement and use MAP_LOCK_TYPE_THREAT
[mr2015] Use damageInfo in CalculateSpellDamage() method v5. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing
[mr2016] try fix crushes in EffectPowerBurn. need test.
[mr2017] tru make proc on splitdamage effects v2. need test. related to #873, #1025
[mr2018] additional pet cast check from Zakamurite. also some verbosing in log messages
[mr2019] clear player cache while player delete. related to #1024.
Merge branch 'master' of git://github.com/mangosR2/mangos
Revert "[mr2015] Use damageInfo in CalculateSpellDamage() method v5. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing"
sorry, wrong commit :(
This reverts commit 18e12752e0859dc205f229c2c6875bda1c4fd99c.
[mr2020] Use damageInfo in CalculateSpellDamage() method v6. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing - also some additions in DamageInfo method (not affected to current calculation) for feature use.
[mr2021] some style changes
[mr2022] add some vitual destructors because class has virtual function
[11995] Fix following for guid linked npcs on evade

Thanks to grz3s for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11996] Fix targeting for spells like 53022

Thanks to Inquisitor for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11997] Add spell support for 54092

Thanks to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11998] Implement fail chance for spell 54732

Ths to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11999] Implement spell 45204

Original author Wowka321, thx to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/SpellEffects.cpp
[11999.5] Support loading tables with default filling into SQL-Loader

* Add special field markers to fill a column in SQLStorage with default values
* Add a safeguard to DBCStorage::EraseEntry, Add helper function DBCStorage::InsertEntry to store content

Note: If required similar adjustments to DBCStorage might be reasonable if required
added default shape for boxes
Merge branch 'master' of github.com:Tezar/IMT3601
added waypoint type
added waypoints to the box.xml
removed references to old track generator
added waypoint loading in engine
mates scaffold
Add runtime version of maketx.
iOS XCode Project file.
In progress
Update from upstream
Merge branch 'master' into ios
Merge branch 'master' into libmaketx
Merge branch 'ios' into wex
Merge branch 'libmaketx' into wex
Merge branch 'ios' into libmaketx
Update names and match original spacing.
Merge branch 'libmaketx' into wex
Checkpoint make texture and iOS changes.
Update maketx.cpp and build.
Maketx optimizations. Thread alignment and filesystem workarounds.
Merge from upstream master.
Merge pull request #3 from danwexler/wex-update

Pulling in my changes for maketexture, ARM and iOS.
Do not test Tan grad avour its discontinuity.
Remove the rise of tolerance as we now correctly test the good range.
Merge pull request #994 from nouiz/tan_test_range

Tan test range
better docs...
file have notes for test
emulator started
renamed source folders for shorter names; added example programs
Moving sorting out of foreach loop
Updated tweet button default text
show osgroups associated with a repo
deletion chk
ENG-3501. Removed 2 unnecessary else's and fixed the indentation.
ENG-3630 Fix bad conversion of default timestamp during snapshot restore.
ENG-3630 Added HSQL unit test and worked around formatUTC() bug.
Merge pull request #181 from VoltDB/ENG-3630

ENG-3630
Fix initialization race.

At initialization, BabySitter wasn't calling the watch list
callback (if it lost the race to the leader elector chain
initialization).  Also, it would call watch() from outside
its executor service which makes watch unexpectedly reentrant.

Fix both of these errors.
Remove some debugging. Add others.
LI
Merge remote-tracking branch 'upstream/master'
testing
Add --fix option to licensescheck.py
minor cleanup
Distinguish the bold --fixall option from the legally neutral --fixws option that only fixes white space issues.
Merge pull request #187 from paulmartel/notest-licensescheck

Distinguish the bold --fixall option from the legally neutral --fixws op...
Merge pull request #175 from VoltDB/notest-licensescheck

"licensescheck.py --fix" tries to fix most whitespace and license text problems.
Update file.html

Cleanup.
RC1 Pre-commit to sync up changes on robot
fixed last_updated block. To show statistic only from user's compas stations
Merge pull request #227 from Arpaso/master

last_updated fixes
bugfix: could not delete an application category properly
bugfix: could not move applications
introducing TreeTable, a common wrapper for agenda and applications-view
moved hiding of modals in javascript/admin/index.js
bugfix: could not move applications
added support for `method` parameter to switch between GET and POST
Merge branch 'master' of github.com:WoLpH/mailjet
New loadouts - more smokes, backpacks

- added GPS to CO,DC,FTL by default
- added 8slot backpacks to CO,DC,FTL (filled with 6 ammo, 1 grenade, 1
rifle grenade)
- added 1 green smoke to CO,DC,FTL
- added 2 regular smoke to medic
- remove GL flares, replaced equally with white smoke and HE GL ammo
- filled left spaces in AAR backpack w. grenades
- more ammo/grenades on body for AAR when taking backpacks
Adds dist. Management to maven life-cycle
Retirando a pasta ipch
Update index.php
Page-proofs main site page
Animated language buttons
On/off menu icons
Path can now point to the current directory again
Use MEF to provide external logging implementations for the reducer

This is the first pass at making logging more flexible.  Open to hearing
others' opinions.  MEF documentation is located at
http://msdn.microsoft.com/en-us/library/dd460648.aspx.
Path changes
Finally got all the paths working with the client so that we run the same code embedded or standalone
Finished up how we can work from the embedded version or the standalone version.
Lower the config name threshold

It is necessary to lower the threshold for this configuration name
because of SQL Server limitations on object name lengths.
Merge remote-tracking branch 'origin/develop' into DynamicTables-experimental
adding silent targets
adding url checks for testrunner
add url checks for connection
add url checks for database
add url checks for document
browser compatibility and first browser version of cushion
Add a semi-colon for the linux version.
Google Minify

thirdparty extention
Minify templates
Generate and save as files custom CSS and JS
Minify combined CSS
Minify and combine files directly to a folder (usefull for path
depended thirdparty extentions)
Requirements file path fix
Requirements compressed files fix

Requirements block uncompressed files after compressed copies was
included
LeftAndMain compres files
Git ignore auto-generated compressed files
The current state of the component
Wrap CodeMirror in a module

This solves some race condition problems we were having (because we had no idea when it was ready to use)
Remove bluemoon from mfiddle examples
working code for sparse maximum correlation with multivariate x and y
Added test

Change-Id: Id7beb4b5edd68d6b154d4576d08cf184171edc42
Minor code improvements

Change-Id: Idcaeee2c4ea009908ffde57a50bc6fa9f2169adc
Added an API to query layer projection

Change-Id: I46edd0e2323ab0d55ed85f1c61beb88d6a575ff7
Added utils.c, etc.
pgsql code updated
RSA v1.2

More changes to help it find factors of d more efficiently and run the
decode better.
RSA v1.6

Optimization and getting rid of stuff that doesn't need to be there.
Plus some commenting.
Fixed local leader and fuzzy indent for Clojure.
Odbieranie danych po stronie klienta
fix build system on osx
Add state of the work done in Mallorca. This is the combined work of the terrestris team back then.
Correct the mappanel example. Centering and zooming isn't as expected, though.
Merge pull request #12 from marcjansen/mallorca-state

Add the Mallorca state to have a common starting point
Fix legend panel example.
Indentation fixes.
Make the permalink example use external libraries.
Merge pull request #13 from marcjansen/example-fixes

Example fixes
fixed popup example.
Merge pull request #14 from chrismayer/master

Fixed popup example
Removed logs.
jsdoc for Legend.js and minor cleanup
mappanel: fixed undefined state var
jsdoc for legend/Image.js
mappanel: use AbstractComponent's addPropertyToState to update state object
jsdoc for legend/Layer.js
remove .gitignore
jsdoc for legend/URL.js
Merge pull request #15 from fvanderbiest/mappanel-bugfix

Mappanel: undefined state bugfix
Update layer model with jsdoc tags and proper class name & alias
Merge branch 'master' of github.com:geoext/geoext2
More interface goodness
ajout de Carl
updated basic search
added the guest page
Replaced tab with 4 spaces.
Remove hack for flask-mustache by adding @tpl_ignore decorator.
configure urls, and uncomment gii
clean trash
2259

Make it more clear that evalArgs recurses on the arg list.
Tests optimized
Submodules updated
added key binding for last-window/pane
[#115] Disabled the Ubuntu 8.04 system package verification step in the deployment process since we'll be upgrading to Ubuntu 12.04 as our base OS.
[#117] Updated RSR code archive URL for new archive path on Github.
[#117] Updated the unpacked RSR code archive mask.
[#117] Corrected symlink target path for current RSR app path.
[#117] Updated the RSR app deployment process so that we always download the latest archive since the downloaded files no longer contain commit hashes to distinguish different downloads from the same branch.
[#118] Added FileSystem.read_file() method for reading remote file contents.
[Fixes #118] Improved the CredentialsFileReader so that we read any credentials in memory rather than via file handling.
Merge branch 'feature/infrastructure_updates' of github.com:akvo/akvo-rsr into develop
Added akvo.rsr.middleware.normalize_domain helper function to make sure we are never dealing with domain names longer than 3 parts.
Added new PartnerSitesLocaleMiddleware
Support for variances from Aligulac.
Changed shebang in simul.py to work with virtualenv
pip-requirements added
Requirements in README added
Git ignore added
Merge branch 'master' of github.com:alendit/simul
Fix M3 nut traps in compact-extruder.scad
Bugfix: AMF export was not working anymore. #799
update version to 2.5.4-SNAPSHOT
DUBBO-537 configserver注册中心地址可以不配
using more appropriate unboxed functions, skipping some bounds checking
rebranded the project as ``httproxy``; ignore ECONNRESET
Change number of ITERATIONS to 10000.
The tests seem to pass with higher probability. I have not seen the
good sorter fail after 15 tries (though more tests should be done).
The bad sorter incorrectly passed only twice in those 15 trials.

Overall, the speed difference is still noticable. On my machine, running
10000 iterations takes 6 seconds for the good sorter and 9 for the bad
sorter. For 100000 iterations, it takes 60 seconds for the good sorter,
90 seconds for the bad sorter. Finally for 1000000 iterations, it takes
on average 600 seconds for the good sorter and 900 seconds for the bad
sorter.
changed the message in user form for adding websites
more fixes on forms
solving conflicts
fixed same error on jobs and projects
Renamed instructions folder and file
nimi-firefox branch merge
corrected bug in abs computation of numbers using torch.abs.
Merge branch 'master' of github.com:andresy/torch
Began exhaustive recursive graph search

Implemented swap() fully and partial tour()
Splited the code in to 3 modules.
Merge branch 'master' of https://github.com/anha0825/wbug
test program for loading chifit.so symbols from an external program
external function declaration
Sentinel: Sentinel-side support for slave priority.

The slave priority that is now published by Redis in INFO output is
now used by Sentinel in order to select the slave with minimum priority
for promotion, and in order to consider slaves with priority set to 0 as
not able to play the role of master (they will never be promoted by
Sentinel).

The "slave-priority" field is now one of the fileds that Sentinel
publishes when describing an instance via the SENTINEL commands such as
"SENTINEL slaves mastername".
On crash suggest to give --test-memory a try.
Added polygon drawing functionality
Merge branch 'master' of github.com:aodhol/nearme
Test UTF-8 decoder in the right package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1425788 13f79535-47bb-0310-9956-ffa450edef68
Prep for a second set of invalid bytes from the Autobahn test suite that is not correctly handled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1425789 13f79535-47bb-0310-9956-ffa450edef68
More refactoring prior to added new tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1425790 13f79535-47bb-0310-9956-ffa450edef68
Adding example of nanowire with empty core.
Renamed package to com.ec.morsms
Updatetd AndroidManifest.xml to reflect updated package name
Fixed AndroidManifest.xml to reflect new main launcher
Merge branch 'merge'

Conflicts:
	MorSMS/bin/AndroidManifest.xml
	MorSMS/bin/res/drawable-hdpi/ic_launcher.png
	MorSMS/bin/res/drawable-ldpi/ic_launcher.png
	MorSMS/bin/res/drawable-mdpi/ic_launcher.png
	MorSMS/bin/res/drawable-xhdpi/ic_launcher.png
	MorSMS/bin/resources.ap_
new music files ui
song playing now based on mf-cor; rf
origress bar for mf
showing only selected
+ selecting music files
fix for music files complect rerendering
hidding overstocked (draft)
hidding overstocked; new nav title draft
title changing draft
working title changing
jshint
rf
working url getting
ignore transit changes for navigation
old code removed; jshinted
jshinted
play button for current file
selecting song file ui
song files ui rf
rf
less exp
Merge branch 'master' into web_app
added rerun, stop and cancel task handler
Use local ribbon image.
Remove unused local variables.

http://code.google.com/p/esprima/issues/detail?id=311
Vary the parsing test with and without location info.

http://code.google.com/p/esprima/issues/detail?id=343
Speed-up unary expression parsing.

The fast path for parseUnaryExpression() is to go straight to
parsePostfixExpression() function.

V8 version 3.12.19 shows 3.7% speed-up.

http://code.google.com/p/esprima/issues/detail?id=350
Add tests for the grouping operator.

These tests highlight the problem with syntax node location when the
expression contains parentheses.

http://code.google.com/p/esprima/issues/detail?id=345
Workaround for binary expressions containing group operator.

http://code.google.com/p/esprima/issues/detail?id=345
Use the editor properly with IE.

By placing CodeMirror within div instead of p, it won't throw a warning
(exception). This way we don't fall back to plain textarea anymore.

http://code.google.com/p/esprima/issues/detail?id=300
Start ChangeLog.
Speed-up unary expression parsing.

The fast path is when there is no postfix operator.

Safari 6 shows minor 3% improvement on the benchmark suite.

http://code.google.com/p/esprima/issues/detail?id=350
Revisit the parser choice in the speed comparison page.

Drop ZeParser and Narcissus, add Acorn.

http://code.google.com/p/esprima/issues/detail?id=351
Update README, preparing for 1.0.
Start the development of version 1.1.
Merge branch 'master' into harmony
Formatting.
Small test cleanup.
Smells as trait, spec for README examples, clearer types.
formatting
close files properly
Added a geographic_distance() function to the Ablation model
Added dummy plugin + config changes to include it in compilation
Dummy commit to see if GitHub is using my username for commits properly now
(It would just list "Ashley Z" without having a hotlinked username before)
ADD GETIMAGESBYCATEGORY()
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
FUCK IT GODDAMN
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
more search styling
Merge pull request #224 from bdupree/master

search styling
added permissions to category and image searching
Update README to highlight Go code
Merge pull request #12 from robyoung/patch-1

Update README to highlight Go code
- Start of text styles to Lua.
Preparing ground for log mediator implementation.
libathemecore: support process backgrounding on MOWGLI_OS_WIN configurations (closes #5)
5006: Check whether the current login user is in the group that the file uploaded via "file storage" belongs to.
refinements to mobile theme with added tablet support
UIfy
Undirected Graph interface, generics

Change-Id: Idb047d3f0689ef5aa074792013c583494d41d138
fixed some final things
Keep utf-8 chars intact
Moved backtotop into a plugin
Better viewmodel design with nested viewmodels
修正 list-5 标题字体大小不一致的情况；修正 list 列表项为空时候的显示偏移BUG。
Better content for the README.
Docas.io synced with 12fbb8d
Added nodequeue and views_slideshow
HistFactory: Added ConstraintTerm navigation to HistFactoryNavigation, added warnings in Channel.cxx when histograms have negative bins, added protection against negative logarithms in FlexibleInterpVar, code==4


git-svn-id: https://root.cern.ch/svn/root/branches/dev@46578 27541ba8-7e3a-0410-8455-c3a389f83636
fix warnings on Ubuntu.


git-svn-id: https://root.cern.ch/svn/root/branches/dev@46563 27541ba8-7e3a-0410-8455-c3a389f83636
- refactoring and logging
переделана страница "главная", добавлена сущность "period"
Layout and Style

Mocked up the basic form for the main game.
Added nbody program for shootout benchmarks.
Added vectorized version of nbody benchmark (with a bug).
Fixed bug in vectorized nbody, added timing measurements.
Added binary-trees benchmark.
Added fannkuch benchmark.
Fix heap example.
bitarray: added <<,>>,rot[lr],bitstring
bitarray: default to Bool instead of Int

only bitones and bitzeros now default to Int
bitarray: small fixes
bitarray: added flipbits
Merge pull request #808 from miau/master

Fix heap example
bitarray cosmetics
bitarray: use macros for lowlevel bit operations

a bit uglier, but forces inlining and improves
prformance for reverse and transpose
Merge branch 'master' of https://github.com/JuliaLang/julia
bitarray: added map_to
bitarray: remove spurious fill function
bitarray: more code polish
Added benchmark spectralnorm.
Rename: base/table.jl => base/dict.jl.

The last and most obvious part of the HashTable => Dict rename.
Add minimal instructions for rebuilding using MKL.

Unfortunately, I don't have an MKL version that we support on hand
to test this right now. I'll have to work on that.
[libshairport] - add patch for fixing fallback from ipv6 to ipv4 (needed where AF_INET6 is defined at buildtime - but ipv6 is not available at runtime - rbpi for example) - thx to ribbon10
Platinum: allow some statevariables to reset to default value after sending completed (needed for ContainerUpdateIDs usage)
[UPnP] fix: use Announcement manager to update metadata and volume statevariables
rather than every second in Application::ProcessSlow. Also handle play/pause
toggling.
Merge pull request #1578 from alcoheca/renderer-updates

[UPnP] fix: use Announcement manager to update UPnPRenderer state vars
use to8Bit(true) to return UTF-8 std::string's, else toCString(true) to return utf8 cstrings from taglib.
fixed mixed up artist/album and genre/comment on generic music tags
local season art was not correctly overriding the scraper art. Takes care of part of #13336
CVariant: add ctor taking an std::map<std::string, std::string/CVariant>
[UPnP] announce library updates to UPnP clients, via ContainerUpdateIDs state
variable. Disable upnp announcements while a scan is taking place.
changed: AnnounceRemove before actually removing the item
[UPnP] allow users to disable informing clients of updates
jsonrpc: add "art" property to VideoLibrary.GetFoo methods
jsonrpc: add "art" property to VideoLibrary.SetFooDetails methods
Merge pull request #1582 from alcoheca/upnp-cache-notify

Upnp cache notify
[UPnP] typo causing no watched overlay for movies
Merge pull request #1601 from alcoheca/fix-watched

[UPnP] typo causing no watched overlay for movies
CSmartPlaylistDirectory: fix path for episode smartplaylists
[UPnP] fix watched overlay when playcount is unknown
[UPnP] increase number of requested items per iteration. gives 2-3 times speed
up.
[UPnP] device icons
Aloha Editor in CreateJS example
Merge pull request #93 from evo42/master

AE in CreateJS example
include libv8
Работа по пакета jqplot
cleaned up documentation, added eavesdropping for synql
dox cleanup
Code for insertion sort and merge sort
Ever more Windows.
Update to Configrity as used on BlueEyes master.
Implementation of access checking via /whois.
support both single admin and list of admins
support both single admin and list of admins
quote match by regular expression
kalua: cgi-bin-sql: db add/update via scheduler, not directly: this is really something which can take time and blocks the webserver
README: added a link to a prebuilt full-tarball for section 'piggyback-ing kalua'
Add specs and implementation for DsclStore#all
Make sure we don't try to resolve names in tests
Remove unused token constants
TODO
Ocean depth PP rule and minor merge optimisation.
Remove files

removing files
fix .nets testsuite files for make dist
1.7.4 version-bump stuff
blocksplugin html tester now converts &gt; &lt; etc correctly.
Fixed some stupidity surrounding the blocksplugin.
Mixed up Stage & Sprite fields... :/
blocks_by_text
Starting work on text_scripts
Work on Bitmap, Form

Also: Tweaked Ref, readme
Merge /Users/tim/Backups/d430/kurt
Removing .sprites property, as it's wrong.
Tweaked block plugin docstring
PR#5218: use $(MAKE) instead of "make" in Makefiles

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.00@12692 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
PR#5218: use $(MAKE) instead of "make" in Makefiles

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.00@12693 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Updated licens header