labofsahil/github-event-dataset-2012 huggingface dataset:
Project Euler and Coursera updates. Add regex practice
Coursera Week 3 stuff
Replace dynamic with reflection
Added stronger acceptance test criteria
Merge branch 'dev' of github.com:solyutor/cardflow into dev

Conflicts:
	Backend/Domain/AggregateRoot.cs
	Backend/Domain/Board.cs
Added links to support and feedback

Next task is to add a button to the web app to give feedback using
UserVoice.
Merge branch 'master' of https://github.com/sorra/OfficeBoost.git
template tidying
solve deadlock during restore
Made the pdf image smaller.
Remove the jQuery dependency, fixing #1
Moving files over to main domain. Compressed CSS
fix circular reference in lookup
some performance tuning on online lookup
add css transition to poster
Add to cart making as ajax
working on leakage approximations
各テストメソッドの概要を明確に記載
パッケージを、jp.co.nttcom.eai.camel -> jp.co.nttcom.camel.componentに修正
Update Laravel and Generator
Use amos that is now bundled in openlibm.
Remove amos library and update the amos license.
Move extras/specfun.jl into base/math.jl, and move the location
of the documentation as well.
Update special function tests.
The debian/ build stuff is out of date.
Update documentation for mathematical functions
Added (psi,di,tri)gamma functions from Rmath to math.jl
Whitespace fixes in .scm files
DRY: supported architectures are the same for all platforms
Merge pull request #1477 from waldir/master

Make list of supported platforms/architectures (in ReadMe) cleaner & DRYer
Mention Windows support in README.md.
Pass FC to the openlibm build for the fortran compiler.
Merge branch 'vs/amos' of github.com:JuliaLang/julia into vs/amos
Literal Dict syntax follows Arrays conventions

i.e. using square brackets infers type, using curly
brackets uses type Any.

Examples:

  {1=>2,3=>4} is a Dict{Any,Any}
  [1=>2,3=>4] is a Dict{Int,Int}
Added Dict comprehensions

Examples:
  [ i/2 => 2i for i = 1:4 ]
  { i/2 => 2i for i = 1:4 }
Added typed Dict literal syntaxes

Examples:

  (Int=>Int)[]
  (Real=>Integer)[2.0=>1,1=>0x2]
  (Real=>Integer)[i/2=>2i for i = 1:4]
Change Dict{K,V}() to (K=>V)[] everywhere
fix #1481
bump openlibm version, for freebsd fixes
fix #1482
Merge branch 'master' of github.com:JuliaLang/julia
deps/Makefile: add a couple of missing compiler overrides
cmus music player added in Awesome menu
Added a Project scaffold
cleanup whitespace
move Sun label in orbit view a little higher
integrate latest changes into Investigations 1, 3, and 4
job pointcuts
Avoid warnings for assigned but unused variable
Everything is now handled by external tools; don't need lib anymore
Add org-mode to ibuffer groups.
[1411] Yekkanti - Renamed the couch template as it is conflicting with another initalizer
#1397 - Ashok/Kavitha - Fixed the advanced_search feature
Merge branch 'master' of github.com:jorgej/RapidFTR
[1411] Yekkanti - Temporary hack until we get the DNS entries right with the newly provisoned linode
Merge branch 'master' of github.com:jorgej/RapidFTR
Merge remote-tracking branch 'upstream/master'
Enable rulers in sublime
Spec helper goodness!
Change index.aspx to default.aspx to serve from root url
remove CharIterator(renamed to TailCharIterator)
first implementation of BitVector.
renamed file to proper name
tighter language in README
Different movement costs for different levels.
Enter/exit costs.
cowabanga
homework lab answers
Site updated at 2012-09-30 13:21:34 UTC
mark methods for headpin-cli (ActivationKeyTests.java)
改行コード見たくなったのでステータスラインに表示するようにした
vimgrepがエラー吐くようになったので抜いておく
cabbrというのを知ったのでつかってみる
[AS7-4918] Registered module using OSGi capability not visible as a bundle
Add SimpleWebAppTestCase and update a few components
Add BundleResolveProcessor & BundleActivateProcessor
Add notion of OSGi Content Delegation to ModuleSpecification. SimpleWebAppTestCase pass.
wall
Merge branch 'master' of github.com:tdubourg/spylight
Mode column and calendar colors more Trello-like

I also took the ng-init off of the calendar partional to fix an issue of
repeating events
put in yaml and py file
Fixed Avatar Size for Undefined avatar
Add alert and notice, add main slide, add login box
updated addon help
Add panda herbs
status commit: HTML display/reply/etc. progress
checkpoint for merge
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into email2
status commit: iframe shenanigans
html display works with hacky pan/zoom; no embedded download

wooooooo!
html message display is working nicely; reply is up next

nb: I have not committed the changed gaia-email-opt.js; build from my
html-mail-initial branch if you want to use it.
reply on an HTML messages shows the right thing; needs work

The HTML iframe is not actually interactive, and the textarea should
likely turn into a magic expand-on-demand variety or something like
that.
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into email2

Resolved conflict cleanly; it was just a new method being added in the
same place on both branches.

Conflicts:
	apps/email/js/message-cards.js
improve inert html reply implementation, make text area grow/shrink

Replying to an HTML message puts the HTML all inert below the textarea
that the user can actually edit.  We reuse the iframe logic that we use
for display, but make it non-interactive so the user doesn't end up in
a hellish scrolling world that sucks.  I tried to use preventDefault
and/or stopPropagation via a modified gesture detector to stop the
automatic scrolling of the page if the embedded HTML page could scroll,
but that didn't work and the user experience sucked.

So now we just zoom out in the newsletter case and make it impossible to
zoom in, but thereby allow a seamless-iframe experience.  (seamless wouldn't
work in this case even if we had it because of the transform.)

The transform may be super-sucky performance-wise and we may need to
create a platform issue, etc.

The textarea now grows/shrinks with the input to avoid being in a
situation where one would need to scroll the contents of the textarea.
This seems desirable in general (to avoid sub-scrolling areas), but is
particularly essential for the combined textarea/read-only html display
to work at all.
update gaia-email-opt.js for HTML message display/replying
update gaia-email-opt.js to fix html snippet bug
fix linting errors from my HTML patch and squib's file size patch
don't let the iframe eat drag events in non-newsletter mode

also, a minor efficiency fix to avoid double-setting the iframe
style in the noninteractive newsletter case.  (Used by composition.)
try to distinguish no card from card in use states
Merge pull request #3486 from davidflanagan/sdcardstate

try to distinguish no card from card in use states
fix review changes requested
Merge pull request #3384 from asutherland/email2

[email] HTML mail support (IMAP), r=squib
six weeks calendar fix
Merge branch 'calendar'
Merge remote-tracking branch 'upstream/master' into calendar
six weeks calendar fix
Merge branch 'calendar'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/michalbe/gaia
fixing tests for calendar
Merge remote-tracking branch 'upstream/master'
removing trash
moar trash
Merge pull request #3516 from michalbe/master

Six week calendar if necesairy
cardsView configuration change
Merge pull request #3778 from michalbe/master

cardsView configuration change
performance optimization - skip unnecessary iterations when converting between strings and charCodes
Switch from hardcoded list to app.removable to Identify Core Applications
Install webapps under /system/b2g/webapps instead of /data/local/webapps
Make the gaia installation path dependent on the AOSP build variant.

For eng (default) builds, use /data/local/webapps
for user (production) builds, use /system/b2g/webapps
Moving the safety check for the import sim to the function itself
l10n cleanup after #4554 + missing l10n entities for the Settings app
Merge pull request #4569 from ckerschb/saveIterations2

performance optimization - skip unnecessary iterations when converting b...
Showing the import sim button whenever the contacts list is empty
Fix lint
Merge pull request #4565 from fabi1cazenave/l10n-cleanup-4554

[l10n] cleanup
Merge pull request #4572 from arcturus/contacts-4543

[contacts] When removing all contacts show again the import from sim
Merge pull request #4566 from marshall/systemApps-v3

Gaia apps in system for user (production) builds
modify to render gh-pages
Adding industry and region to MembershipDefault model.
Jobs: category and subcategory drop downs on search.
add alias of python
69 for test
log4ssh
hoge
connect album and user
One-day caching? Perhaps
Another cache attempt
adding paperclip and aws-sdk to gemspec
document proposed new features
build 0.0.0.1
Merge branch 'master' of https://github.com/thedgm/flickr-bis
set up simple tracking example with dtrack
Clan whitelist from smurf silence
MEF input and loading

Now MEF loads plugins and accepts input for the query. Thanks to
senseibaka for troubleshooting the input code.
added option to disable exporting
so sorry overwrote teh wrong CMake
Forgot I updated this CMake as well
made domain name look up off by default
fixed a MOOSThread compile issue with variable called status and added some developmental code for storting a safe list
addeded versioning
Merge branch 'release-10.0.1-rc2'
Inital Commit
Remove winblows-style line endings
Fix a bug / add a few things

* Add an option (-z) to zero-fill unused space in the ROM
* Fix a bug where nesasm chokes on directive without preceeding whitespace
Add coding snippet for python.
adding some ubuntu defaults to bash rc
creation of repositories
added TIME_ADJUST config variable

so dates of games will look normal (for us EST's now)
fixed idiot math in time adjustment
fix noon 12:XX display thing
fix noon 12:XX display problem
bad reporting of rd fixed
Added code for getGamesByPlayer()
Sample usage of DbSqlite to generate statistics data
Initial checkin of kick ass javascript only charting bundle.
Sample rankings display.
Adding JSCC License
"Better" Makefile.

Give up, and use the older (non obj) GNUmakefile, as it seems to
have less issues.

Lawd, how I mess bsd.*.mk;
sdf
test commit
Initial commit of project
README updates
README updates
imported service in webserverd
testApplication (test)
Temporarily Commit for updateing the main repository of team 3
Merge branch 'master' of git://github.com/ErikBlanken/HuSacct-2012
Opmerkingen over de use cases.
Merge branch 'master' of https://github.com/timvdalen/OGO-2.2
Object geupdate voor Material
Merge branch 'master' of github.com:timvdalen/OGO-2.3
muntjes
specify python version for travis
Update screenshot of dog house.
finalize evaluation
Update README.md

misc change of doc
module Main:).
Adding documentation to both readme files to disable scripts. 1.4.1 Update
to ensure everyone is running on the same page after the GIT/SVN mess.
remove stringencoders
fix weird name parsing conflict
make waker eventfd non-blocking to prevent deadlock in fdtask
wip on compat with task1 api
add runtime::cancel. move task2 to play2.
hack for wait all
more work on backwards compat task api
change cancel_points to _cancel_points to ease migration
get all tests compiling with task2 compat
work on making channel and qutex tests pass
disable net test for now
disable failing net related tests
benchmarks compiling with task2. fix race condition in runtime::ready(). make runtime::wait_for_all efficient
disable chrono fix, was causing problems with high_resolution_clock accuracy
use atomic_flag
fix missing include
add std::experimental::optional as ten/optional.hpp
Merge branch 'master' into task_compat
rename alarm_set to alarm_clock. rename alarm to scoped_alarm. use optional for front_when, and rename to when
convert everything over to new task system. split some of task/runtime. add ten::compat namespace for backwards compat.
move task guts into task_pimpl
Draft of new deps for future
Call BEMHTML.apply for building HTML for i-popup block
all実行時に重複しないようにした
New format for tests.

Reviewed by @tolmasky.
make more minor editorial fixes
Fixing the footer...
got mailer working on development, nice-ified footer
#nav position: fixed
Working on new badge forms
Correction lié à symfony 2.1.3
Adição de empresas funcional no labori-empresa
ID dos objetos inseridos via SQL aumentado para não colidir com o auto-increment do Hibernate
Consertado nome do XML de configuração do Hibernate
makes chages to index markup that describes the test app.
GeoStore 2.4 : debug FireSpark improvements
nav still collaspse trying to fix responsiveness
committed expo layout changes
Update README.md

removed code
multiplication complex
suppression accents qui s'affichent mal
suppression optiondialog
merge
more verbosity on failed fulltext insertion
fixed an error introduced with last commit
fixed compile warning about initialisation order
Merge pull request #175 from trontrytel/master

pull me
Merge pull request #177 from trontrytel/master

pull me
Merge pull request #178 from trontrytel/master

pull me
several fixes in sdm including a fix for the real_t(return(size_t)) issue
sdm: fixing long/real type mismatch in sd_diag()
further sdm fixes (seems to work much better now, but only with sstp=1); automatic test in wkc_icmw8_case1_t0
sdm: doing sd_diag() only for timesteps that are recorder into the output files
sync
Merge github.com:slayoo/icicle
tests/sdm_golovin draft
modify init.el for setting Font
Fix custom rake bug
removed cowboy git repo
removed cowboy dot git dir
Add instructions for running in dev mode.
Fixing typo in docs.
Merge pull request #5507 from bradly/2.1.2-wip

Fixing typo in docs.
added landing page
static, templates
temporary commit for rename
working activate+generate for vcs_freshclone, now testing
Improved for check mac.
add temperature measurement
Updated the Edit Record Menu
Fix proper content selection per page when copying template
added active class to blog filters; foramted post date
better OO structure filename/directory classes.
Removed pdfpres.
Refactored webm? code with Rav
commit gato_01
commit gato_02
commit gato_02
* execution engine on mac os x
* v2.4: it's portable
* better execution engine usage on run
Default training algorithm now calls add_dataset (instead of set_dataset)
Added default mode ('sequential') to Monitor.add_dataset
Merge remote-tracking branch 'upstream/master'
vdumoulin's PR to extend Monitor to multiple datasets didn't extend the
prereqs very naturally. This adds a test that prereqs work with multiple
datasets
Merge branch 'master' of github.com:lisa-lab/pylearn
fix dtype problem
bug fix: bgd add_dataset, termination_criterion; unittest for bgd
Merge pull request #111 from memimo/bgd

bug fix: bgd add_dataset, termination_criterion; unittest for bgd
support plotting with batch or epoch count on x axis
make learning_rate a shared variable that is monitored
add profile of bc01 format max pooling
more performance notes
djdj
trying to merge
reverted back to old base
Merge branch 'Erik'

Conflicts:
	trades/views.py
Took out some files I commit on accident
working on views.py
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
I believe that I have implemented accept offer, decline offer, and remove listing buttons. I also added the transaction_id field to the transaction model.
Add tests
Revise readme
huracan PC

Signed-off-by: Gabriel Vigliensoni <gabriel@vigliensoni.com>
Huracan patch + MS

Signed-off-by: Gabriel Vigliensoni <gabriel@vigliensoni.com>
Added series functionality.
Added data.json to ignore list
Revert "Added data.json to ignore list"

This reverts commit 461d2e3828787ea375a997631ef857012d00c323.
Ignore data.json (the right way this time)
Disabled new features (as they are still WIP)

Also, added trimming to the methods container header and added soft-hide
CSS class to index document so when the content is loading empty
containers don't show up on the screen.
Created resources/sass/surf/mixins/_layout.scss
Scott's Branch
Merge remote-tracking branch 'sap/Scott' into Iph
sysinfo update
fix style in previous merge
change --grep, regexp escape the input
Revert "sisarpras v.0.1"

This reverts commit 84608995d11eaaf3267fcdc160934ffd5cc85a54.
+ testing -> http://code.google.com/p/the-ace-kernel/source/detail?r=e9a02831028a789450f4928770b9c078eb75c905 [do not merge]
Pocetak rada na topic-74
todo: defaultSyntax void
modified
Merge branch 'onodawork' of github.com:wakamori/jskonoha into onodawork
parse func
add sample.html
1+1+1 ok
read script(option -s )
modified
merge onodawork
Merge branch 'master' of github.com:wakamori/jskonoha
Implementation of capabilities : SOUND ; Fix : init var boucle for
Fix: close remote RDP connection open close dialog box
Fix: timeout on connect
Fix: remote connexion failure open close box
Debugging color depth support
Implementation of capabilities : INPUT
Renamed MCS_XXX -> DomainMCSPDU_XxxxXxxx
add <hr> before footer
incorporate David-Sarah's suggestions
Disable building of unneeded audio codecs
Made changes to .bib file to get it to compile correctly
Adding ANOVA, statsmodels forumlas, and scipy distributions
Added fix to the working example script to prevent all the build commit to be at the top
Fixed issue #533 by adding the polyfill class to dynamically created details summary
Merge pull request #534 from LaurentGoderre/v3.0

Fixed issue #533 by adding the polyfill class to dynamically created details summary
remove li height, fix z-index
Fixing bold text in README
added beginnings of client login area
Merge pull request #97 from will123195/master

typo
better errors for aql
formatting
wrap validation in a transaction as well
validation will not run set_field methods for fields that already have errors
validation will only break on the steps if we are using string errors, not ValidationErrors (bc)
refactored global $dbw so that dependency is in only one place
Model::addInternalError() and static $internal_errors so these are consistent with $possible_errors
cleanup getByClause to use getList
added todo
fix typeo, remove redundant is_update, it is a complement of is_insert
Merge pull request #98 from stanistan/master

Model validation and some AQL updates
Merge commit 'bd53024371c6e336ff53543b1bd32229c0529d2d'
cqlparser: version bump to 1.7
Fix copyright year
Merge pull request #38 from dylans/patch-1

Fix copyright year
CRM desde BD

Metricas ya se toman desde BD con sus parametros y opciones
Adds/moves space generation and interpolation functions to appropriate namespace.
Adds real-number spaces.
Adds pattern randomize() and normalize() methods.
Fixes texture create for user objects.
Added support for all barby symbologies
added openopt bdist
Added boxes examples (in 2 versions)
Revert "Edited URL in comment"

This reverts commit 434f8f89a73ff215848b3de17cf5c853edc234ae.
alles geht
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
check for empty ua string
Merge pull request #19 from fanzeyi/master

check for empty ua string
Add the Interpreter class to the Chip8 namespace.
[!] splashscreen timing

Signed-off-by: xtursky <xtursky@gmail.com>
Merge branch 'xtursky_master-dev' into innovators_dev
[+] dopisane nejake komentare
Tag Dispacherインタフェース追加
change to set the current selected element in menu
correction de SMS et model grossesse
Add simpleburn ebuild
modified ruleset.
fix d'un pluriel
Merge branch 'master' of github:yogsototh/Scratch

* 'master' of github:yogsototh/Scratch:
  regeneration
  regeneration
  fixed a lot of text quality
css try for iphone
add libs for talking to graphite monitoring system
tomd/grahamc: do not hide fields with local vars
tomd/grahamc: unused import
Merge branch 'master' of github.com:youdevise/Blondin
kobuki : ycs exterminated, truly.
removes unused package dependencies
Enable <ESC><ESC>: noh
Misc project - Anticheat for CSS v34 2.0b

Recoded Form7.vb sending method.
Misc

Organized rep.
Fix button not working problem
Added class result operation
Updated translations
Update CMake.txt to add plugin networkmanager
Refactor Board class.
Remove Redundant Code from SessionManager's regenerate function
Merge branch 'master' of git://github.com/zendframework/zf2 into remove-redundant-code
ZF2-385: Fix problem for predicates containing %

As the queries are built using sprintf format - having a where with a %
character is treated as an escape.  This "escapes" the escape -
replacing %'s as %% to print a single %;
Merge pull request #1704 from protecinnovations/remove-redundant-code

Remove Redundant Code from SessionManager's regenerate function
Update library/Zend/Http/Cookies.php

Docblock changes
Merge branch 'hotfix/http-cookies-docblocks' into release
Merge branch 'release'
pdftest fix
Merge branch 'patch-1' of https://github.com/gabriel403/zf2 into hotfix/2665
Merge branch 'hotfix/2665'

Close #2665
Fixed CS errors
Merge pull request #2066 from coss/hotfix/cs-fix

Fixed CS errors
Fixed Zend\Validator\Iban class name
Merge branch 'hotfix/2438'

Close #2438
Merge branch 'patch-2' of https://github.com/umpirsky/zf2 into hotfix/2617
Merge branch 'hotfix/2617' into develop

Forward port #2617
ZP Dev Guide: Finish Component Modeling.
proactive form truncation detection

Detect and report when incomplete forms are posted for:
plugin options
plugins
user groups
users

(Note: image form truncations are already detected.)
Fixes RSS with mod_rewrite off
release id 82f45de50b
Readme file describing the repository
Revert "Readme file describing the repository"

This reverts commit 16fd8e9f833ec6bd08193246d2b3a76d054912ce.
random uuid instead of timestamp uuid
add devise
replacing custom user model with devise user model
initial devise user generation
install base devise configurations
kan komme til / fra vis
Site updated at 2012-09-13 10:07:22 UTC
added build and vendor to ctrlp custom ignore list
Merge remote branch 'lgro/valgrind'
Proper github URL. Doesn't work.
Исправлено меню, теперь имена по БЭМ-методологии
Creation of the datas module
* Use correct category
 * Display description as well as checksum
Merge pull request #236 from iseppi/silly-description-admin

admin silly description fixups
Hey, it works! Added DB placeholder class, finished up API of PhraseFinder. Just need to clean up the code.
Cleaned up PhraseFinder code, removed commented code, added more comments, etc
fit some bug and modify some info
Fixed inconsistent time zone config keys
Organization; #1
cleaned up logging; server command is now just a shell command
Fix dependency for compile-swc.
alteracao diversa
Refactor rate limiter compaion object, add per-5-minute limit
Updated the ImageButton and the Complex input to use the ImageButton

Updated the ImageButton to display correctly on IE and added code to add the
hand cursor on the button.  Also change the save, undo and add button to use
the ImageButton. And add setters for the styles of the add, undo and save
buttons.

issue A24Group/Triage#1933
Merge pull request #128 from Sh33pman/updateComplexInputToUseImageButton

Updated the ImageButton and the Complex input to use the ImageButton
Début de traduction de "controlflow.rst"
Fin de traduction sur controlflow.rst
Quelques corrections d'orthographe
Traduction de datastructures.rst
Corrections sur datastructures.rst
Merge remote-tracking branch 'upstream/master'
Traduction de "errors.rst"
Quelques corrections sur la partie "floatingpoint.rst"
Traduction "inputoutput.rst"
Traduction de "interactive.rst"
Merge pull request #13 from tflorac/master

Fin de traductions dans tutorial.po
OSM test data in sqlite format
Expose GPIO7 for 4030
Kill that awful samefile stuff.
Kill path filter stuff in rtags.el. Not used and not right.
Yet another version of cleaning up IndexerJob.
I believe this has been causing us to occasionally quit when clients
disconnect before we finish them (with ctrl-c)
Add a set current project function to rtags.el
Properly remove same file stuff.
Prefer definitions for find symbols and add some elisp
Make listsymbols work with grtags
I couldn't get this to work right but I'll leave it in
Fix scope
GRTags is pretty functional at this point!
More info in log.
Fix bug 8788 The super constructor call can be prevented by mentioning "return"

Fixes the flow analysis by clearly distinguishing "ALL branches have called a
constructor" from "ANY branches have called a ctor".
There are a large number of special cases.
fix issue 8818:  CTFE fails to compare strings correctly
workaround for dmc codegen bug
Fixes Issue 8178
Fixes Issue 8770
add LINKCMD64
Merge pull request #1196 from AndrejMitrovic/Fix8178

Fix Issue 8178 - Wrong line number in trying to modify enum string
Merge pull request #1195 from AndrejMitrovic/Fix8770

Fix Issue 8770 - Wrong error line number with immutable field
Merge pull request #1190 from rainers/issue8818

fix issue 8818:  CTFE fails to compare strings correctly
Merge pull request #1180 from donc/super8788return

8788 super() can be bypassed using return
Added webapi-vim which is a dependency of Gist.vim
Can sort descending at player list
Remove refeshonly as apt_dist_upgrade could be executed whithout an event which trigger it
Calculate total count and add refresh button
Cleanup
Merge pull request #6 from ArcBees/vr_pagination

Pagination
Merge branch 'master' of github.com:ArcBees/gae-studio into vr_edit_entity
803 Build version advanced to 1589-38

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@123381 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@123382 eb64e737-3616-4df0-8941-5ee2ae88103d
Merge branch 'master' of git://github.com/CloudifySource/cloudify
GS-803 Build version advanced to 2493-163
Merge git://github.com/CloudifySource/cloudify
Change 'unless' to 'if' because 'unless' is wrong here.
Merge pull request #3655 from denschub/feature/fix-followhq-setting

Change 'unless' to 'if' because 'unless' is wrong here. [ci skip]
Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting"

This reverts commit b0fc95764d2864aab68805620f1a0f48f9f1d4fd, reversing
changes made to 0057e9ed46d1fe8e7417a499465053231c40a734.
Minor fix on the GameMenu Scene
edited level.json
Merge branch 'master' of https://github.com/Avladiev/Optiks_v2
huge changes in structure
Menu Plugin: general improvements
Fix Twitter settings.
corrected problems with resource and element arrays
New examples of personalization
Normaliza propiedades css
Merge branch 'dev' into 4.0_beta
more cleaning in telemetry files
one more file removed
update telemetry files in default conf
math: fix some quaternion macros with brackets for use with pointers
ahrs float_cmpl: compute fixed point representations as well
ahrs cmpl: directly compute initial quaternion from accel and mag instead of using euler angles
closes #132
Merge branch 'dev' into 4.0_beta
ahrs: removed obsolete declaration
ahrs: use ABS from std.h
rotorcraft gains: do not use ABS anymore, warn instead if gains are negative
fixedwing gains: do not use ABS anymore, print info message that all gains are positive now
ahrs: removed obsolete declaration
abort an attempted i2c hard reset if attempted toggling of SDA, SCL does not free up lines.
Merge pull request #140 from adevitt/master

i2c abort on timed out i2c_hard_reset
Merge branch 'master' into dev
Merge branch 'dev' into 4.0_beta
fix turntable systime
ahrg, removed garbage from previous fix
changes on navgo board for new baro and update some airframes
Add KeyMatch method that will return whether a string representation of a key matches a (modifiers, keycode) tuple.
Take KVC scalar/structure support and NSAttributeType into account when inspecting properties.
app.config cleanup
app.config cleanup
Slider timer
Slider timer
* confirmed compatible with WordPress 3.5
* minor documentation updates
* remove load_textdomain as redundant (see plugin header)
* Remove unused Author option
Moved building info from Tiles into WorldSegment, tiles just keep a pointer.  Building index removed, now checks pointer equality.
updated pivotal tracker dll and related adapter
better syntax highlighting
various small improvements
add default order for post model and use POST_TYPES variable for generating routes
- PDOSQLServer, Zip extensions added to the solution
- ApplicationContext refinement, avoiding static ctor and dead static field

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C3026
changing some configurations
* Improved login stuff
Refinements to global detection, kind of works
add empty holes, nat and numerals; put "max" back
tweak TOC output
Changed modeler app var.
Clean up spacing, etc
test from my old setup
Google added new maps!
get rid of automatic interval change, just make shift-g cycle through them
Merge branch 'modelviewer-grid'
remove the dead labels toggle button code from WorldView
add a KeyAction (bound to tab by default) for toggling body labels
only respond to the label-toggle key when the WorldView is active
Merge remote-tracking branch 'upstream/master' into lua-dock-count
change default binding for the Target Object key to SDLK_t
fixed spaces -> tabs issue: Thanks to jpab for pointing it out
Merge branch 'master' into navtunnel
GetDockingPortCount should  return a const int
GetDockingPortCount should  return a const int
oops.. const around the wrong way
Merge branch 'lua-dock-count' of github.com:Philbywhizz/pioneer into lua-dock-count

Conflicts:
	src/SpaceStation.h
naming consistency
Merge branch 'lua-dock-count'
Merge remote-tracking branch 'johnbartholomew/issue-129'
Merge branch 'master' into navtunnel
put scanner area overlay text into ShipCpanel itself. rework WorldView to use it. RefreshButtonStateAndVisibility() gets more painful, but at least its relatively contained
use requested size as we have no size if we're not in a container
add missed file
Fixes, seems to come towards the middle of the screen now. Still need to handle offscreen coordinates, possibly using the current stuff to work out what side it should come from.
last night:
Story 8: Corrected bug in video.psm1 (errorInput) plus avi support
le puishx
Merge branch 'master' of github.com:Dirbaio/Durum-Lare
ER NAVAJASO PREMOOOOH
Merge branch 'master' of github.com:Dirbaio/Durum-Lare
Revert "Finished 32, 16, 8 bit multiple code writes"

This reverts commit 0d6715f5d246ccf90097d65711a14456a6bf1469.
Spreaded set
Merge remote-tracking branch 'origin/master'
- Added the ability to use custom containers inside the channel object. Please check out the comments to get an idea which constraints have to be fulfilled.

- Added an example that uses copied Channel-shared-ptr-objects.
Fixxed Bug of last commit. (#56)
fucking cap
Code refactoring for fragments implementation
Fixed sprite code for new resource location
Fixed problems with new resource locations.
Initial ObsidianBomb
ObsidianBomb is now working.

It needs some nerfs though.
Ignore the out.jardesc file
Remove out.jardesc
delete bin folder
Code improvements
ObsidianBomb finished
Merge remote-tracking branch 'origin/ObsidianBomb'

Conflicts:
	.gitignore
Added timestamp of last pull
[BACK-37] Reverted change for monthNames.
[BACK-37] Fully reverted
[Migration] Changed person migrator script
[Migration] Stuff
[Migration] Test succeeded
'Blaat'
[Migration] Updated resource migrator
stuff
stuff
for 2157
869
hoi
blaat
d
Fixes in BookingMigrator
[MIGRATION] Bla
[Migration] Changed booking migrator to only take cars specified by henry at 02-07-2012
migratielog
Blaat
b
Lots of rearranging, added keybinding handlers and helpers
Fix overlong arg lists due to recursion
Minor updates
Merge branch 'master' of https://github.com/Eyescale/CMake
Readd files lost during subtree merge
Update FindEqualizer
CommonCPack fix
Merge branch 'master' of https://github.com/Eyescale/CMake into 1.4
Minor cleanup
Minor cleanup
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Store per-slave instance information in versioned master cm (#116)
Doxygen and unit test for #116
Closes #116: Blocking co::Object::commit
Refactor C&P code in buffered master CMs (#116)
Bugfix for #116
Rename MasterCM->VersionedMasterCM (#116)
Reworked code into forms
Improved UX
exclude files without meta data from recently uploaded files
Merge branch 'master' of https://github.com/FinalsClub/djKarma
Renamed ship to transport
Factored general ship behaviour out of Transport into Ship superclass
Added settler and scout
gitIgnore <3

I like this.
[mod/geocountry]
Modification du style de la fenetre
Now a genuine functional REPL site
new ListView component and Calendar fixes

- ListView is clone of ListBinding with immutable data storage and cleaner design
update vald modified date, new database
Merge remote branch 'samuel/master'
Merge branch 'master' of git://github.com/Griatch/VAMDC-VALD
Minor fix to Environment.
Merge branch 'master' of git://github.com/ivh/VAMDC-VALD
enable/disable sub-controls
quitado espacio que sobra
add blank slot list block helper
modified share activity.
app store!
Merge remote-tracking branch 'origin'
add some button pics
FavoritesTableViewController dynamic picture downloading
Merge remote-tracking branch 'origin'
added files
Merge branch 'master' of https://github.com/Horkyze/webstranka
Add hdmi_boost handling code.
Add the fb size handling code.
Hopefully Fixed the TODO section to look better in README.md file.
FIX arm state #3

evidentially its the easy issues that are biting me this morning...
add more info for crash tetrix was seeing when launching valuedump
Add '

as a character we strip when doing a FilterPath()
Revert "FIX:GetBestTarget (high or low) to actually return the lowest value entity first when choosing a low value entity (default for drones)"

This reverts commit f2ea7fea415d5abb196c982437c12d7ed416d385.
testing orientationchange instead of resize for the event
Added arrows image for preview
more districts Avahan
[metrics] Use GPL+ license

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
[blame] Use GPL+ license

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
[pepper] Use GPL+ license

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
[REminiscence] Use GPL+ license

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
[gbrainy] Use GPL+ license

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
fallback + add_feed required
Error in Symlinks Instructions Corrected
change behaviour of client proxy form gen_fsm to gen_server
Payload codec now supports multiple ordered restriction criteria. Also removed unnecessary exception throw declarations.
One page version and clean up.
better unicorn configuration
Improve grammar registration script
Use more sass variables
Get rid of jasmine gem, use phantomjs instead
support ConfigurationInterface to read canonical configuration
travis ci really does not support casperjs
implemented and am now testing git hook for pre-commit tests
fixed borked files and fixed (?) pre-commit git hook
fixed git hook for reallys
[json-rpc] check add-on art existence using CFile::Exists() rather than caching the art (it'll be cached on request if needed)
Merge pull request #1876 from jmarshallnz/addon_art_checks

[json-rpc] check add-on art existence using CFile::Exists()
CGUIWindow: resolve includes on copy of xml element to avoid manipulation of stored xml element
jsonrpc: fix JSONRPC.Version definition in methods.json
CGUIEditControl: only handle GUI_MSG_SET_TEXT if the control is focused or is the receiver
[osx] fixed dmg background images, thx amet
Merge pull request #36 from xbmc/master

Merge XBMC master
Added a lot of stations
Pushed fetching of forecasts to task queue
Added task queue
Modified provincie/regio behaviour
You can't just put <h3> after <h1>, you need <h2> between them (especially for SEO). I know that the heading of 'Article Comments' is also <h2>, but it's OK, we just need (must :D) to change also the CSS code. I'll change it too.
parse body and such
KDevelopment Project-File added
Zero must be the Checksum and not 10 if the calculated value is 10
Missunderstanding Usage fixed
Indentation fixed
Merge semantics for fetch()

See https://github.com/documentcloud/backbone/pull/1220
multimedia/mplayer2: Import
multimedia/mplayer2: Fix default cdrom device (/dev/cd0)
Inital commit
Merge branch 'master' of github.com:Marthyn/TDD_ENIGMA
Adjust runtime to default
Refactored common code out.
Added missing method to check if a BaseObject3D.java is visible.
Animation3D.java was not flagging the start and stop of animations. Also moved variable creation to the class level to prevent unnecessary GC
Merge pull request #12 from ToxicBakery/master

Bug Fixes for Animations and BaseObject3D
Revived basic type for the Require haters
Kill extra hint ignores
graphicedge
Merge pull request #81 from DavidLarsson/master

Grafikfix
whops assembler screwed [register + label] while [label + register] worked. fixed now
Working alpha version after EUHackathon. Great job guys\!
Minor update
Added mustache code for base generator, so errors won't occur when people do. Origin: https://groups.google.com/forum/?hl=en&fromgroups=#!topic/geddyjs/8O2MEL9sqEY
```
geddy app test --mustache
```
Merge branch 'master' of github.com:mde/geddy
Closes #223, Added Utilities documentation, also fixed a typo in templates docs.
add in error checking for the site
Merge branch 'master' of github.com:mde/geddy
added error template and some logging
Fix for site documentation with doc numbers > 9.
add code highlighting
highlights
Merge branch 'master' of github.com:mde/geddy
Adds missing message for german
Release 2.2.1

Signed-off-by: Meldanor <Bhaals@gmx.de>
- fixed TNT/Creeper destroying Paintings
Custom : Remove minimum player check (used to fix proc for our custom Arathi)
Custom : ignore level requierement for battlegrounds
Some footer styling
removed errant error_log instance
new headless jasmine syntax
Various enhancefinements.

Fixed the toolbar buttons so now they look depressed. Hug them to make them feel better.
Got the back button working properly in the Task list
initial project import from KDevelop
string substitution & gui fix
LILY-556 Disable shutdown of minimrcluster to avoid long hangs when launch-test-lily quits.
README更新
README更新
Merge branch 'test'
Ver.1.37.00
$refreshIntervalForNotCommet をデプロイ・イニシャライザで指定可能に
dunno
Merge branch 'master' of github.com:Niaobu/BlackCoffee
Now I get it.....I think.
Indexes and database tests
Fix carousel ordering
Fix preview link
Remove useless files
修正一处小问题
Increased maximum line length in Eclipse formatter from 120 to 170 to
match Intellij codestyle.
Changed name of Intellij codestyle to something more meaningful.
Minor refactoring of component output code between ComponentCollection, NeuronCollection and SynapseCollection. Formatted all source.
#337|Sanchit|Created Repository for supply line
|#337| +Sanchit | Added handler for Supply Lines. Cleaned up SupervisoryNodeBuilder for isApprovalPoint.
#0|Manjyot, Lokesh|Added E2E test script for manage facility|
Generalized the hotspot sheet.

Added a hotspot class
Localized the HardonCollider code to classes/hotspots
Game class to track global functions

Cleaned up most of the game's globals
All communication is through game table now
Bug fix in test case
Updates to tests

Include tests on switch statement indentation, and more tests on naming
conventions.
Line Length test

Added a test for lines > 79 characters.
Merge remote-tracking branch 'upstream/master'
Integrating Simon's name tests
Added code to test braces
Merge pull request #4 from jgat/master

Moar tests
documentation update on Dancer::Plugin
Updated error message for floating-point errors
Ducks now spin when falling down
Added Tree Trunk texture, Imported a JS port of the MouseLook script so we can access it in an options menu for sensitivity option
Deleted JS port of Mouselook because I realized you CAN set the sensitivity already (IM DUMB)
Debug Sensitivity Adjusting added, use N/M keys
Improved trees! Made a bush mesh so the trees look more like the Duck Hunt trees :D
build settings for Linux.
fix conflict
Add an enum for BlendModes, and add cached versions of each UserBlendOp to UserBlendOps.
Add a BlendMode setting to Layer.
[WIP] Instead of using CanvasRenderer to render each layer and then painting it on top of the canvas, let CanvasRenderer write directly to the final canvas.  Also add support for the layer's blend mode.  For now, all layers are Normal, which is a simple 1->1 copy.
[WIP] Add support for zoomed [in|out] canvases.
[WIP] Handle the LivePreview layer.
[WIP] Handle offset layers.
[WIP] Tidy up.
[WIP] Implement GridRenderer.
Remove unused properties, tidy.
[WIP] Replace original CanvasRenderer.cs with NewCanvasRenderer.cs.
Remove dead code.
Add support for BlendMode to LayerProperties.
Add BlendMode to the Layer Properties dialog.  Add support for BlendMode to Layer Properties history item.  Get rid of generated crap for LayerPropertiesDialog.cs.
Add support for blend modes to the OpenRaster format.
Add new strings to pot file.  Remove colon from "Blend Mode:" so existing translation will work.
Merge branch 'blendmodes' of https://github.com/jpobst/Pinta into jpobst-blendmodes

Conflicts:
	Pinta.Gui.Widgets/Widgets/Layers/LayersListWidget.cs
	po/messages.pot
Merge pull request #17 from jpobst/blendmodes

Add support for layer blend modes.
LVL SPLASH
/me adjustments.
The bukkit.command.me permission is now required to send an action, and it has a minimum argument length of one.
Configuration formats for /me from CONSOLE.
changelog updated for 2.0.3
Add support for init parameters to JsonRpcError.

Fixes #19.

This also allows custom errors to be defined without creating a
subclass.
Add some debug logging.
fixed bug calculating the vote_cache for textnodes without votes
Merge remote-tracking branch 'origin/master'
Posts and Hangouts page created
Merge pull request #3 from fampinheiro/master

Let's create posts.
update user faq with spatialite information

be more specific about spatialite geometry types interpretation in ArcMap
Adds RCPL PAC feature/custom module for OPAC related stuff.
Adds the Item node type to rcpl_pac feature.
Removes additional old cruft from rcpl_commerce.
Adds features.inc to module file and removes dependency on rcpl_commerce.
Updates RCPL PAC feature with horizon_bib_records rules component and updates to field type.
Adds Sarnia configuration to rcpl_pac feature.
Implemented subject picked listener
Code rationalization
Implemented TimeEditText
경로 또 수정
Starting a rolling config from the UI leaked S3 lock files which stopped
future config changes from committing.
1.2.2
Update delays ?
ftplugin: When jumping to sections check if the line is commented out
ftplugin: Use more convenient shortcut for jumping to previous section
ftplugin: Mark functions redeclarable

To avoid errors when splitting windows.
Analyse de la ligne de commande et chaînage des layers, \nplus d'autres petites modifs dans les listes et correction d'un bug dans lut
updated readme about runme
Afinando procesos
Verificando la actualizacion del borrado
Fix for #r954298 by @bantu for phpseclib not needing any Composer dependencies
add optional isEqual argument to skipDuplicates
update skipDuplicates documentation
Adicao das pastas por categoria de produto, tela de acessorios ja 70% funcionando
PACKAGER: Cisco
-Don't set loadInformation if its not a sip79x1G
Merge pull request #55 from tm1000/master

Cisco Cleanup and additions
PACKAGER: htmlentities
Merge pull request #56 from tm1000/master

Fully Fix DNS SRV for ciscos
PACKAGER: More Cisco fixes for DNS SRV
Merge pull request #57 from tm1000/master

Tons of DNS-SRV Changes (now in transport)
PACKAGER: Global DNS-SRV
-After further review of this protocol is should be under transport, not a separate option! urg
Changes to Mitel
Modificaciones de Sesion
Added tagging functionality in js.
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Minor bug fixes, adding tagging functionality.
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit

Conflicts:
	js/album.js
Fix misspelled word in SQL
Gastenboek toegevoegd
Gastenboek toegevoegd
Processing example (sphere color)

Displays the sphere color in a more realistic manner. rgb(0,0,0) should
not be black but white. We use a white backdrop and the brightness of
the sphere color for the alpha value.
Changed lattitude limit unit from NM to degree (purely cosmetical)
Update of README.md
Merge pull request #3 from dbetebenner/master

Update of README.md
first commit
Fixed 2 bugs. "multiple_slide_visible" was showing extra button if number_of_slides was an even multiple of number_slides_visible. "ac_selected" class was being applied to extra slide_buttons (those which start with the same number as the button that is really selected).
Added License (dual MIT/GPL). Removed old & min versions of JS files.
readme update
readme
Carousel json
Merge branch 'master' of https://github.com/Seasquash/php-test
Win screen bugfix
diffrent enque
Finished exercise 5.6 #1
Finished exercise 5.6 #2
Finished exercise 5.6 #3
web: Link to v10
added fixtures for autocorrect
added readme
Add skin added by upgrader BT5.
New bt5: erp5_bearer_token
Follow up db2311b84ffd2be10c2122e7f9e918a74924a38e
Simplify.

Do what user said and *exactly* what he said.
Test requestStop and requestStart.
Test instance.unallocatePartition
+key-file, ipaddress, crc
[#122] Anand / Rajashree : Scripts for bundle install and packaging on GO agent
sorting out oddity in english? and doing some tests
more tests preserving spaces on CLI
Svn head was bad, moved to the downloadable version
Fixed CRLF to LF in pmm.c

still don't understand while cb always safes with CRLF
Added Test TestData_Interface_Fluid_Air

Fixed a bug in the hook.
added new version with disabled GUI and interfacing to a django server instead.
Added QuadraticPredictor
updated coments in all files
Commit history offered as secondary rss feed
dsi-upload-image does the check of existing both .vmx and .vmdk image
no more prompting password, according to the request
Fixing, and refactoring
Added bin stubs to git ignore, and force server to create tmp folder
cleaned the output
better usability for Chibi configuration
Always forget the return 0;
Update IC2 API (1.95b)
make it more universal yet still preserve my target directory
Apllication & Boostrap
Scripts/Ogri'La: Change credit target type from invoker to invoker party
Invoked Spring
Minor fixes for entities construction in Identi.ca implementation
Fixed error with encoding
Improved status variables for marks (favorite, retweet, etc). Fixed the duplicated users issue in mentions. Minor improvements
Merge pull request #25 from satanas/fixed-duplicated-mentions

Fixed duplicated mentions
Added slot, adjusted plug hole & arduino hole

Need to: Double-check arduino hole, add width to switch
Moving gem to root, adding sample test
Fix `Set::extract()` close #196
Merge pull request #736 from jails/pr1

Fix `Set::extract()` close #196
Check if condition is really a closure before attempting to call it. Avoids global function collisions.
Merge pull request #701 from aksonnic/prevent-pollution-by-globals

Reduce potential pollution by globally defined functions
Moved phpunit.xml to project root
Al instalar el policy, se crea el portlet con links utiles, el folder de encuestas con el contenido debidamente filtrado, el folder de articulos de noticias, se realiza la configuracion inicial de NITF, google news y collective.upload. Tambien se agregan tests que testea todo esto
gemfile.lock to ignore
Merge branch 'develop' of github.com:Vizzuality/cartodb into develop
enable errors in login form as per central
Added weapon sensors and firing, collision detection
Warning message when a proposal can't change state,rather than a non-visible exception
Merge branch 'master' of github.com:VoteIT/voteit.core
Don't mark polls as unread, we'll use count for unvoted instead
Trying to fix wrong title msgid
Using xml for rss template so i18ndude won't pick it up
Fixing translation syntax. (title would have been a message id otherwise)
Adjusted english translation
Last translations for iteration Q
fixed issue with .gitignore
可以用js计算总缴费量
más iconos y borrar
improved tests for servedir too
adjusting order step paddings