labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #14 from zhuzhaoyuan/bversion

bump version 1.4.0
add document for ngx_http_user_agent_module
modify the document
Merge pull request #15 from dinic/master

modify the document
update the docs for ngx_http_user_agent.md
Merge pull request #18 from dinic/topic

update the docs for ngx_http_user_agent.md
bugfix:priority of procs module is useless
set delay_start default value.
bugfix:msleep after process init.
modify the document of procs module
Merge pull request #20 from yzprofile/dev

bugfix: priority of procs module is useless
merged changes between nginx-1.2.0 and nginx-1.2.2
Merge pull request #21 from yaoweibin/merge-nginx-1.2.0-1.2.2

merged changes between nginx-1.2.0 and nginx-1.2.2
Merge branch 'master', remote-tracking branch 'taobao/master'
add the upstream check patch for least_conn module
Merge pull request #25 from yaoweibin/least_conn_check

Least conn check
It looks good to me
fixed wrong format type with error log in upstream check module
Merge pull request #26 from yaoweibin/topic

fixed wrong format types with error log in upstream check module
Adding a tree feller spell
Merge pull request #9 from zippy120/master

Added a curse for spawning zombies
Merge branch 'master' of https://github.com/botskonet/DarkMythos
Added a spell that enchants the players armor, and a Curse that breaks the armor
new tornado-redis integration
修复分割线样式适应小屏幕，修改文档
change log
Merge branch 'test'
Added comparison operators plus slight priority changes.
Added a scheduled stat, along with a maximum execution time parameter.
Read chapters 10 and 11 of the Django book.
Integrate saving and loading of defaults into views

Instead of simply loading defaults, this verifies that they exist so
that a default "Please enter something" box will still appear if no
default was actually loaded from the key.
The defaults save at the same point when the normal display is being
set to ensure that a value currently exists.
Wikitext is parsed on the server
Read Comics in Public
[AOL] Add api.oscar
imgbox
[CloudFlare] Cosmetics
[Morrisons] Secure cross-domain cookie
[Morrisons] Cosmetics, don't force www
ChipIn
[Boxee.tv] Try to fix bug 5931

Most conservative attempt first.  Namely, not securing cross-domain
cookies.

Bug: https://trac.torproject.org/projects/tor/ticket/5931
[Pinterest] Re-add pin/

pin/ doesn't redirect to http.

Conflicts:
	src/chrome/content/rules/Pinterest.xml
out in a catch in case someone denies our request for access to their social media
Pluginifization updates
Removed pluginifzed views
First KW test
adding calendar table view controller
fetching workouts and routines; deleting routines
Area should return an area when converting, not a measurement
add the check logic whether directory contain slash('/') or doesn't in the last string
Implement code for dealing with piecewise equations; this still needs to be tested properly
Add the models that I have been using for testing (some of which are translated from existing 1.1 models).
Update notes for submitted changes

* Navbar: Allow for up to seven navbar buttons
Update notes for submitted changes

* SystemUI: WiFi Signal Text
Update notes for submitted changes

* Fix our interpretation of apn setting's bearer.
So I am un-fixing something I "fixed". If all toggles are
disabled, none should be displayed. But I had it displaying
the stock toggles if all are unchecked.. d'oh!

Change-Id: Ibdcb3e433f5f9493b5fffb7684e30b5591789c90
Signed-off-by: gdanko <gdanko@gmail.com>
Merge "So I am un-fixing something I "fixed". If all toggles are disabled, none should be displayed. But I had it displaying the stock toggles if all are unchecked.. d'oh!" into jb
Added first parser

* Parses presences in given sessions by date
* Added in README organization a suggested structure for URI
Merge branch 'master' of github.com:Aeronautics/Spitfire
Added test for Buff component.
Added Buff component.
Added shell for PowerUpCollisionHandler.
Fixed Buff so that it now correctly extends Component.
Updated tests with a unified way of testing float equality
Fixed imports with eclipse
Added license information
Implemented handleCollision

Also added testClass
Added Friction component and test
The friction component is now used
Added a quick enemy
Spawnsystem now spawns quick enemies aswell

Every 5 enemies that spawns is a quick enemy
Updated tests with the new friction
Added a max limit for the velocity
Added a score component
Added killscore and powerupscore to the hudrensys
Added time to the hud and moved the score
Changed the z-index for timeText
Changed the font size of the hud text
Added javadoc to score.java
The player can no longer get outside the map
Cleaned up in collisionsystem
Merge branch 'master' into issue#1
Changed the copyright message at the top.
text datei
-Before_Factory_changes
Divide upload into two parts: toolchain and sources
fixed user role field form
Bug in ManyToMany relations
Merge remote-tracking branch 'origin/master'
Started to add message formatting.
修改邮件接收人，添加releaserun_j，支持在CI平台上的release模式
Merge pull request #292 from tianlili/dev

Dev
whoops, i thought 1.1 was already released
add task owner requested
fix cancel button bug
Merge branch 'bean' into develop
"v4"
PHP work to handle solr updates
Add git hook to link host specific make.conf on merge.
Added make.profile to gitignore.
Add make.conf to gitignore.
Add make.conf for aeries.
Added `merge_rows` for merging table rows (from row template)
Support an arbitrary number of elements between fldChar[begin] and fldChar[end]
Documents new `merge_rows`, fixes todo #1, updates version
прийдя нельзя прийти еще раз, диалог для тех кто на работе
openqg-4 Add an nc_inq_varid functions and use nf90_inq_varid in it
openqg-4 Convert nf_get_var_int to nf90_get_var, nf_def_dim->nf90_def_dim, nf_inq_dimid->nf90_inq_dimid
openqg-4 Convert nf_put* to nf90_put*
Textes centres.
Ajout d'une présentation des talks (à mettre en forme) et un lien dans le programme.
Formatting.
Merge branch 'pr/n77_BryanEllis'
Closes 77.
New test.
Added MARS support.
Added MARS support.
Added DbTypeAttribute support to Insert/Update queries. Closes #79.
Added DbTypeAttribute support support.
Revert "Added DbTypeAttribute support support."

This reverts commit b74af8173d6b09659e91ebb9588bc3ef0b45678f.
Improved sequence support.
Improved sequence support.
Closes #81.
Updated copyright.
Updated version.

Published NuGet packages.
Fixed #84.
Working on #83.
Fixed #85.
Merge branch 'master' of https://github.com/igor-tkachev/bltoolkit
Added #if for using of System.Xml.Linq
switch to our bionic
Facebook  auth as a Slim hook
adding mesh skeleton figure
pål endringer grensesnitt nye/oppdat objekt
Merge remote-tracking branch 'sentral/master'

Conflicts:
	src/hikst/frontend/client/NewObject.java
	src/hikst/frontend/client/NewObject.ui.xml
feil fikset?
Samme som forrige commit
Merge remote-tracking branch 'thomas/master'

Conflicts:
	.classpath
	src/hikst/frontend/client/NewObject.java
	src/hikst/frontend/client/NewObject.ui.xml
Added file missing after merge. Damn nasty xml files not beeing handled properly by git
Merge pull request #3 from sjefen6/master

Merges
Jobbet videre med grensesnittet for å administrere objekter
Merge remote-tracking branch 'sentral/master'
Markør i map oppdaterer seg på trykk og henter ut posisjon og skriver
til angitte tekstbokser (lat/lon)

FINALLY!!!!
slettet død kode
SimObject added + map added
Oppdatere koden for å sende inn sim objektet til databasen slik at det
kan lagres. Fikset bug i Settings. Fjernet cruft fra koden
Merge pull request #4 from sjefen6/master

Oppdatere koden for å sende inn sim objektet til databasen slik at det kan lagres. Fikset bug i Settings. Fjernet cruft fra koden
Får til å legge object i database men er problemer med relasjonene!
tomorrow.fix();
add to database 
+ close to review objects stored in database
+ interpolering's graph ++
js folder added for splineraf
Merge pull request #5 from Eurokro/master

added splinegraf & jsfolder
html file added to git.
Merge pull request #6 from Eurokro/master

html file also needed for commit!
no tags yet fixed
Grouped up like named groupings. This commit may cause more bugs.
Merge remote-tracking branch 'M2/CatalystIT_rel_2_2_rc1_dev' into
CatalystIT_rel_2_2_rc1_dev

Conflicts:
	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm

Signed-off-by: Catalyst IT Services <acoomes@catalystitservices.com>
Signed-off-by: Catalyst IT Services <jBond@catalystitservices.com>
Hamby Updates
Mit einer kleinen Ergänzung.
isValidNumber neu
userIsInTheMiddle als methode
added csharp syntax file. fixed conflicts in csharp snippets file
Added Shoebox to readme
Have the authenication go directly.
Pulled out documents so the concerns about saving/publishing etc are far simpler
compiler warning fixed
more reconnect experimenting.
eigen: add :universal option

Add the `option :universal` to eigen. Tested with clang and llvm
from XCode-4.4.1.

Closes #14304.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
jenkins 1.478

Closes #14339.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ettercap 0.7.4.1

Also marking as fails with clang.

Fixes #14347.
In fact, there are 2 xcode-select files to delete
Formula.Enumerable

Deprecated Formula.all, replaced usage with more appropriate enumerable options. Just check out how much nicer `brew audit` runs now.
Fix Falcon on 10.8

Probably 10.x in fact. Main problem was the internal PCRE didn't build and link errors occurred. Cmake sucks.
libmusicbrainz RIP

Deprecated by the people at Musicbrainz in favor of “picard”.
Better message if multiple kegs need linking
libechonest conflicts with Doxygen of all things
Make lasi build
scantailor *still* fails to build with clang

Lame effort from team Scantailor.
Shark fails with clang
conflicts_with message: recommend unlink

Yes uninstall works, but lets not push people towards that, they can presumably guess that, in the rare case they'd prefer that option.
`brew irb` uses correct Ruby

Conversation here: 0a45d96b21a5056e5131f136e94533a6a57bf808
Support ENV[VERBOSE]
Add anime and close socket when finish
IE hacking for preventing the background with gradient invisible
changed architecture requirement to >= armv7 only, as anything older is not supported any more with Xcode4.5. Also changed the compiler back to Clang, seems to work now
Improved error capture and added tests to validate
Bump version to 0.3.1
[IO] import of oldish files so I have them under version control
Server Side Started

Updated Server Side to the current version
Add submodule for main code
Brought submodule up to date, files in a buildable state
combine all regexps into one
remove simple form initializer
fix db seed
Libreías del WebService con Maven.
Muevo la llamada al WS a la capa de negocio.
Agrego consulta de GPS a la lista de unidades
Probandoooo
prueb
Segunda junta
Chg Material + Resistance
- use new gsdoc syntax file
- always show the fold buttons
Added Include to Player.cpp for Transmogrification.h
dataWidget optimization for 240 and up
Visibility declarations and cleanup for CI_DB_sqlsrv_result
Add dummy method reconnect() method to CI_DB_driver and remove it from drivers that don't support it
[Ulduar]{Thorim}

::> Fixed the start-behavior which is now managed by a bunny.
::> Activated Thorim in ScriptLoader.
::> Moved several definitions to ulduar.h since they need to be shared.
first commit
Merge branch 'master' of github.com:Emerson21/Tecnologia
deletando arquivo readme
removed use of encoding.com, adds capturing of transloadit media id/assembly_id for storing to access on the post form transloadit to our callback url when its done
refactors
refactors ... media_id .. not queue_media_id
removes dependency on encoding-dit-com or transload it and simply calls it transcoding for worfklow state
handles json response from transloadit better, looks up videoTranscoder object, moves along the process to swap urls
adds , on list... need those
uses config for the api key for callback url, adds logging
adds migration for assembly_id stored in media_id column as a 32 bit string
downcases the context of context name prior to looking up the url in its context for being swapped
updates find_by_media_id to serach on string
updates find_by_media_id to serach on string
fixes worfklow state bug
more debugging
more logging. wraps the lookup in begin rescue end and logs Exception
parses the json... need to JSON.parse becore you can play with json as an object... silly json
parses the json... need to JSON.parse becore you can play with json as an object... silly json
it gets the url.. my precious...
has the proper ' and sql is not mad any more
marks videotranscoder object completed after swapping urls
assingmnet becomes assignment
only clones the video transcode if it was processed and has a destiantion url at amazon... but actually process if the destination url is empty.  using more logging too.
refactors switch_url and returns valid workflow_states
Fixed 1.7.3 with jungles
Updatedd es_ES locale
Better optional compatibility
Fixed glitched minecarts
Update the icons for the Note plugin.
wip lock system for download show/keep status in memory (not downloaded, in progress, finished)
added simple sky and ground
Merged settings filed
Refactorings: mainly add some builders
Allows HTML tags in test string
Replace ereg()/eregi() with preg_match() globaly - deprecated.
s/<?=/<?php echo /g
s/<?=/<?php echo /g
At the end of the for() loop, checking if the loop counter is bigger
than 'start*500' - if start=0, then the loop will end because '0 >= (0*500)'.
Set PQL_CONF_DEBUG_ME as early as possible so we can use it correctly.
Rewrite the pql_get_subschema() to use preg_replace() instead of
multiple explodes()'s. Should be faster, but most of all easier to
follow and debug.
s/eregi()/preg_match()/g
s/ereg()/preg_match()/g
preg_match() syntax error fixed - extraneous comma.
Ignore some files...
s/ereg()/preg_match()/g
Fix a ereg/preg_match edit error.
Ignore any problems with a check - add '@' before to make PHP quiet.
In pql_format_bool(), break if called with an array.
Ignore any problems with a check - add '@' before to make PHP quiet.
The 'cn' should be a link to the user_detail page, not 'HREF' (which
seems to be only set if something to do with domain)...
* In pql->search(), prepare for debugging the call params. Can't enable
  it though, because it interfere with frames/tables etc...
* pql_cache->get() was called with a second option - there is no such thing!
* Can't 'new' with a reference.
Add information about the 'group[/<objectclass>[/<attrname>]]' ACL rule.
* Correctly support dumping branch, by using the 'domain=...' value.
* PHP parse error (s/^<?$/<?php/) fixed.
Don't show Mailinglist, webserver, mailserver and DNS stuff it that
is disabled globaly.
mx51evk: Add CONFIG_REVISION_TAG

FSL 2.6.35 kernel assumes that the bootloader passes the CONFIG_REVISION_TAG
information.

If this data is not present, the kernel misconfigures the TZIC, which results in
the timer interrupt handler never being called, so the kernel deadlocks while
calibrating its delay.

Suggested-by: Greg Topmiller <Greg.Topmiller@jdsu.com>
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
uml deps added
Handle Ipopt return codes
Update the comment on solve_dist_full
Remove ensure_foo and replace with new error checking
Remove nonessential data from qp_minimum_distance_problem
version bump to 0.1.2
Merge branch 'feature/error-handling' into develop
clamp, morphology, neuron, neuron_single_cell_experiment refactored: all tables are created without error
Merge branch 'star_schema' of github.com:G-Node/Morphjongleur into star_schema
new test directory with first test 'import.py'
Merge remote branch 'origin/star_schema'
working orm
BUG: propagate arguments in MemmappingPool
Added symbol to resource displays
Removed box blur
Added player 2 arrow key controls
New Torque Toolbox version to disable buttons

If there are no projects, all of the project buttons are disabled.
Rename Torque 3D.exe to Torque 3D Toolbox.exe
Removed config and put back tools/comments directory
New Toolbox version that doesn't pick up on phantom game levels
Merge pull request #38 from DavidWyand-GG/toolbox-bugfix

Bug fix for Torque 3D Toolbox to prevent launch buttons from working when no project is selected. For ticket #12.
Merge branch 'master' into development
Added some of my stuffs :3 It's nice to be back guys
Merge remote-tracking branch 'upstream/master'
Merge pull request #383 from GodOfWar526/master

Added Pieced Rapidash, Chansey, and Venomoth
Merge pull request #382 from Grethen77/master

Just added some stuff I might use
fixed 2nd battle not working with gui correctly
more 1.3 commits
No more compile errors
getting it closer to running
dev-util/jenkins-bin-1.482
Adding global headers.
Add setup script and license.
Add next upcoming event to home page.
Reorganized files.
Reorganized files.
bedre sang
ddd
dddd
Merge branch 'master' of github.com:Grutn/B.rain-project

Conflicts:
	BandMaster/BandMaster/BandMaster/Graphics/Stage.cs
	BandMaster/BandMaster/BandMaster/State/Song.cs
deeel
Remove navbar collapse and black background
Add who's here, fix input box size
Implement scroll for chat.
Fix height of chats and users panes.
Fix user icons and left arrow.
When a new chat is submitted, scroll the pane to the latest chat.
Fix user icon image
Remove broken import
using variables for return
added intermediary to project
Added a direct link to jclustering-latest.zip file
Moved Scene Graph and added Update method

Moved the scene graph to VoidActivity instead on the Renderer class.
In Vector3, removed the constant vectors like Zero and One. (problem
with reference type in java)
Added the update method to the SceneNode and Mesh classes.
UpdatedTo1.2.4
UpdatedTo1.2.4
Oops, forgot some dev changes
Calculator program is deleted, and MathLib is in 1.0

Specs are here
http://db.tt/A1LVaJPf

Added a few new things
If I shouldn't have added MathLib.10c where I did, please tell me.
Additional tracking
Adds the implementation of the service interaction patterns as examples.
Adding a Capret_Tracker library - to get Javascript snippet/ build etc
Improve search field component. Launch status check timer and search timer when needed.
Change default timer interval.
Looks good now.
Step 4 on positive teta fails the quantum space separation.
Step 3 on negative teta fails with spherical vector error.
added enemy_growler
Cleaned up receiving of messages for client.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
world folder added
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption

Conflicts:
	Windows/Windows.suo
changed .suo/gameplay
ignored .suo
added resources
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Merge branch 'Rob_Working'
Added client's user file.
Merge branch 'master' into Stephen_Working
Worked on gameplay and login states.
Added Default Constructors, Destructors, and initialized variables
Merge branch 'Stephen_Working'
skype log searchも追加
last commit: Mon Nov 12 11:21:21 CET 2012
Treasurer Bylaw Draft 1

WHEREAS We generally delegate treasurer to an unelected Brother
WHEREAS We have been advised by PUSOG to elect all positions who have
full access to our money now that we are an LLC
Vista de Activar bono listo
social slider integrado y tabs con estilo
add samples of cascade
shard router is now it's own component
1.add function printJsonDel in print.php
2.modify DelOrder can print.
Merge branch 'jone'

Conflicts:
	DelOrder.php
First pass at HTML&CSS
Modified the greet text.
Added UTF-8-safe yaml support from an adapted version of the ya2yaml gem
Fixing ruby 1.9 issue
Merging latest master
Merging latest master, take 2
Fixing wonky merge issues
Update pending tailoring tests comments.
Fix Enumerator workaround for JRuby.
Merge pull request #74 from KL-7/tailoring-tests

JRuby fix and update for pending tailoring tests comments.
Fixing incredibly annoying Syck vs Psych roundtrip Unicode issues with port of ya2yaml
Merge branch 'master' into yaml_support
Adding localized_hash and better specs for .to_yaml in localized objects
Trying to trigger travis again...
Updating english custom units
Merge pull request #76 from twitter/update_english_custom_units

Updating english custom units
Merge pull request #75 from twitter/yaml_support

Adding Unicode-Safe YAML Support.
Attempting to fix jruby travis build issues (bundler not installed).
fix space jumping

* you can still (intentionally) jump in mid-air
Merge remote-tracking branch 'Genshin/master'
fix student new
student new を修正
Merge remote-tracking branch 'snowsunny/master'

Conflicts:
	.DS_Store
	Gemfile.lock
Fixed Warnigs
StartWork
Final material properties.
TIME CHANGE: 10x
Initial travis CI support
hide +/- buttons where inappropriate
fix
removing gates
removing wires
rubber selection
batch removing (should work)
werbebox :)
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me.git into
beta

Conflicts:
	styles/default/rightbar.php
funktion
center like
Revert "Backuptool: support from CM for backing up / restoring files on flash (1/2)"

This reverts commit aac8b1278a9b7f322cceae2408d6f2648ad92d15.
Fix Core::Init to return Self
Add Utility.GetWorkingDirectory
Add OOP to core modules
Add OOP System
Add escape keybinding to same implementation in main.lua
Revert "Revert "MyString.h add macro""

This reverts commit e52771c0a8f972a618ae8d18fe3227586a121290.
`String#to_safe_file_name' is finished
Removing `run_tests; exit' scaffold
Slightly fixed `to_safe_file_name' doc
Slightly fixed `to_safe_file_name' doc. Again.
Still making PersistentObject
添加：基于给出的值设置时间标尺区的缩放。以便加载文档后恢复原始视图（待写）
改进：水平放大时间标尺区后，如有必要，则扩展StripsContainer的宽度
改进：LinkedViewport垂直或水平滚动后，发送相应的Action消息
实现：缩放时间标尺后，设置Viewport的水平位置，使播放指针所处的位置水平居中
Added android_hardware_atheros_wlan

as it is needed for the building of tenderloin. Now working on Tenderloin for JB
Added more 4.2 bluetooth requirements

Doing this repo by repo but we are missing a few that we need so im merging em in...
Showing pupils via classes.
Integeration test for class filtering.
moved project 3 plan, added .md file
updated specs
first jekyll upload test
*BREAKING* Refactoring method names
idk
submodule
.gitignore netbeans
Merge branch 'master' of git://github.com/MCForge/MCForge-Core.git
IO-Komponente für die Parameter-Boards aus dem entsprechenden Testcase
finished all of base DuckBot.BotResponse except for the BotAction construct 'BotCase'... I already implemented the predicates though
SubgraphFormulas, and KClique and Ramsey  now produce many more binary
clauses which enforce symmetry breaking.

SAT solvers now are way faster on such formulas.
Test LeftMenu
Merge branch 'master' of git@github.com:MaximeRDY/ihm-jtunes.git
pull in lua library for the ldb feature

--HG--
branch : lua
split glider into some tracing libraries (libtrace.la), a glider frontend that
implements the trace/analysis API and ldb, a scriptable debugger implemented
on top of lua.
Add some basic wrappers for attaching and enumerating threads and frames.

--HG--
branch : lua
add frame.pc property

--HG--
branch : lua
provide accessors to signal and source information in frames, also parameters and local variables.

still need to flesh out the value accessors.

--HG--
branch : lua
implement {{{var.value.member}}} accessor, and {{{for name, var in var.value}}} generator

--HG--
branch : lua
add lposix library so that we can drive a test case from lua (need fork, execp, kill)

--HG--
branch : lua
vars can be anonymous

--HG--
branch : lua
fix build on linux

--HG--
branch : lua
refactor the value/var stuff; the accessors for vars are now more natural and
provide access to the underlying var in the target; the type/meta information
has been moved to be accessed via functions in the ldb namespace.

--HG--
branch : lua
rename ldb to wdb to avoid possible confusion with the lldb project debugger

--HG--
branch : lua
rename : ldb-objs.c => wdb-objs.c
rename : ldb-objs.h => wdb-objs.h
rename : ldb.c => wdb.c
change lua table name to db

--HG--
branch : lua
another name change

--HG--
branch : lua
Very preliminary fbsd support; tested on fbsd 8.2 x86_64 only.
multi-threaded target not yet tested

--HG--
branch : lua
Add more info on code signing, sign both glider and wdb (darwin)

--HG--
branch : lua
add support for DW_CFA_def_cfa_sf, and tidy up a little bit of debug.
merge DW_CFA_def_cfa_sf change from the default branch.

--HG--
branch : lua
Added tag 1.1.51 for changeset 35180926b3f7
refs #2817 (spent 0.25)
lock the heartbeat page in memory.
refs #4864 (spent 0.25)
Add --immortal option.

refs #8886 (spent 0.25)
refs #4864 (spent 0.1), refs #8886 (spent 0.1)
Merge pull request #601 from smarterclayton/production_assets_broken

Merged by openshift-bot
Drop openshift-origin-node from broker's Gemfile

The openshift-origin-node rubygem is not needed on the broker.  However,
the broker will fail to start if the rubygem is not missing because the
broker's Gemfile specifies that openshift-origin-node is required.  Drop
this bogus dependency from the broker's Gemfile.
Make cartridge-abstract depend on make

make may be needed in Ruby apps (so that Bundler can compile gems that need it) or DIY apps.
Projeto do Visual Studio 2012 Adicionado.
Prueba de tablet 7 - Todavía sin funcionar

- El problema es que entra en conflicto con la hoja de estilos en
cuestión del UI con el ipad. Funaciona perfecto con su hoja de estilos
pero falla en la nuestra.
swapping readme out for markdown. fixing up broken link in options page
Renamed method in SiteConnection
Obsługa cudzysłowów
Merge branch 'master' of https://github.com/MiniS-Team/MiniS-CMS
Completed the User/Patient creation model
I've finally fixed the model needed from the association between the user model when a patient record is being created.
Explode background-gradient mixin with a function with the same name

We are now able to use background-gradient() in a variable !
Beautify blueprint-grid default example
Update .gemspec file
Fix ui-helper-arrow bug ?
Update border radius demo w/o -ms & -o
Make triangle dimensions parameters evolving

The triangle previously use 2 borders width of the given width, so we now divide by 2 to get a triangle with the width/height given in parameter !
There is now an option for adjusting the auto height (default `half`= width/2 - look nice, `auto` = width - triangle fit into a square)
Delete sqrt() & pow() (they are in Compass already).
Update css removing some prefixes...
Fix a drop shadow lifted corners issue
update gitignore...

...seems to have .sass-cache not ignored
move "shared" to "utilities"
add relative-position utility
Add ui tooltip (css arrow please like mixin)
Update css with more precision
Add ifnotnull() + position() mixins

"position" utility include top-left(), top-right(), bottom-left(), bottom-right()
update corner folded demo (according to previous pseudo-element update)
update corner folded demo according to previous update on pseudo-element()
Remove ui helper arrow (ui tooltip is just better)
implement StartScreen with "Waiting for your opponent" text
Added C code & examples. Ported MainWindow to JavaFX.
ajustes encoding de arquivos
fix to recipes
Gastly shiny particle effects
Merge remote-tracking branch 'MasterBranch/master'
index's fixed
Merge pull request #317 from GodOfWar526/master

Index fixed +shiny particle effects for gastly
fix to lightscreen
New Pokechecker GUI's
Merge pull request #396 from Jaryt23/master

Pokechecker GUIs
Code from my archive
Crop image to fit any screen
optimized for neobundle
fewer loc
poprawiłem indenty logowania
Bug 749080 - Make AudioManager.cpp build again, r=cjones
Bug 749661 - Workaround yaffs2 readdir bug, r=dougt
Bug 749727 - Ensure that each Fennec channel runs its password content provider in a different process. r=blassey, a=blocking-fennec
Backed out changeset 3812e7c1b642 (Bug 749661) for bustage on Android, r=red
Merge backout of 3812e7c1b642 Bug 749661 r=red
Followup for Bug 716644, r=trev.saunders
Back out 23b86b775f6f (bug 749727) for Android Talos bustage on a CLOSED TREE
Bug 746703 - Set targetSdkVersion to 14 in AndroidManifest.xml to disable legacy menu button [r=blassey, a=android-only]
Bug 750130 - Telemetry doorhanger appears then disappears when onLocationChange is fired during startup. r=bnicholson a=android-only
Bug 743153 - Use ContentUris.parseId instead of RepoUtils.getAndroidIdFromUri. r=rnewman, a=android-only
Bug 713524 - Batch bookmark inserts. r=rnewman, a=android-only
Bug 749857 - Don't upload history records without URI or visits. r=liuche, a=android-only
Don't know why this change wasn't in here already - I'll look at that next week
Whoops (fixing spacing bug in top bar)
In an act of great self-importance, giving my styles their own folder
Moved the basic crawler to the respective directory.
Updates README to use Frameworks on Mac
Refactors package-mac-release into packager.rb.
Removes old Mac packager script
Revert "add German translate to 'Err_extra_keywords' message"

This reverts commit 599e97abbcbadf5d416a3cc0d0d292f666a8de59.
Adding cleanup after compile
Ajout de A
Ajout de B
Ajout de E
 Ajout de C
Ajout de D
fixed a bug with sub-pathes
Revert "Revert "ffmpeg: update to ffmpeg-0.10.6""

This reverts commit 958cc3f78ed2cbd23cb9ca0f4e6d482d9ef2076c.
ffmpeg: add uptstream patch, this fixes #1557

Signed-off-by: Stephan Raue <stephan@openelec.tv>
libva-driver-intel: update to libva-driver-intel-1.0.19

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Revert de un Revert "Corregidos los nombres de los ficheros AMEND""

This reverts commit b5c600b97d49eed5fac7ac33d0608e3df7d7a604.
- Ajout de la classe DVCTAPException qui génére les erreurs en cas
d'echec lors du passage d'un état à l'autre!
Tilføjet status bar
New texture loader and add object with physic WIP
Color shader
Change default save name to quicksave
Change Render.clear() to black

Black is the new pink.
Change testWorld bounds

testWorld gets its bounds from its contructor.
Modifying tests
Making some private functions public
Fixing action create provider implementation
Add ProjectLlama/android_hardware_qcom_display
coder module comment styles
Adding Logout tab to user page
Refactoring pushtape.js form behavior to use Formapi states instead
Adding field display formatter options for album tracklist
release date defaults
Merge branch '7.x-1.x' of http://git.drupal.org/project/pushtape_ui into 7.x-1.x-panels

Conflicts:
	pushtape_ui.info
Merge pull request #5 from discipolo/7.x-1.x-panels

Merge branch '7.x-1.x' of http://git.drupal.org/project/pushtape_ui
Updated table editing

colspan and rowspan modifiers are valid for every td and th cell
Updated table editing

Colspan takes rowspan of current node in account for colspan.
Updated table editing

Rowspan and colspan work to the right now.
It uses a look ahead of 1 cell.
Adding optimize button
updated nbprojects
refreshed spanish mo po
dutch mo po refresh and several new strings
Removed suo file and updated README.md
VaultVector class
Merge branch 'master' of https://github.com/Recycler1993/Vault-Tec-Multiplayer-Mod into VaultVector
Merge branch 'VaultVector' into item_envsync
Added shoppig list, because this doesn't need to be private.
Solves Issue 15
mutableArray category
New top-level output
New location for framework to match github
Quick rewrite of command
typo <33
Update for InspIRCd 2.0.7 release.
Fixed coverage problem
Merge pull request #17 from javimey/master

Fixed bug on coverage
tag.php now i18n
insert README(2)
Send command also supports balancedpayments.com links now
Reflects new send feature
Added grouping feature to the <list> template command and used it for the timeline.
Added the screenshot.png to redhot,greennight and orangejuice
Merge remote-tracking branch 'origin/master'
Raise ימים נוראים seat prices
Draw the crosshairs at 0, 0
Editing change_pwd

It is now working
Fix bug with RSS cache.
Remove dead code
Allow structured fs to write streams, not only bytes.
Add the gcfdw, useful for debugging memory leaks.
Change version number system.
CHANGELOG
Clean everything up in the Makefile.
Signed-off-by: Seminar <seminar@seminar-VirtualBox.(none)>
Merge branch 'master' of https://github.com/SirPepe/CampWorkshop
Fix import bug from refactoring
Merge pull request #128 from ZeldoKavira/master

A bug from that refactoring update that stops building
shape factory
updated to version 2.3.3, fixed APN
Заметки по SiteStructure
less warning in source template
full_html filter
Bugfix trackPageview
Changed back link to common-v2 online, due to some erratic styling changes in page look
Block designs are sent with precache data.

Signed-off-by: Chris Churchwell <chrisrulesall@gmail.com>
Add PTO data.
Add history view of PTO.
Add history view of PTO.
Fix link to new page.
Remove.
Reorganize http returns from test, change 304 to 200, Fix spelling for 400. Add description in JSON-output
Refactoring AnimatedLabel / Laboon + Disappearance animation added (PNGs + code)
Pixel perfect collision detection
added R/gbmhdfs.R script
aho-corasick algorithm with manual transition functions
put in better widgets
made items set their attributes based on their params and created walls
Moved updating Floor translate fuction

This is now in a setter for map so that if the map gets set to a
different arraybuffer that new arraybuffer will have the proper function
Fixed a typo

Fixed a typo in attributes began getting the list of all items together
to create one large map
Fixed A Typo again

the file did not commit
added sprite rotation
began creating UI and implemented inventory
corrected the travis bootstrap
Added callback for adding a widget
Manual merge
Added better listing in sub sections
Update Call PlayAudio audio url property
Update DLL packages
Added content to the home page

This really is just to test the cron-update tool.
Report failed HRESULT in D3D init.
Make GL texture types more generic.
(RMenu) menu_loop renamed into rmenu_iterate - iterates menu code for one frame
Renaming Combination to Combinator (w3c language)
Added support for Combinators to sequence parser
Fighters can now be cycled during deployment
update version to elliptics-2.10_2.13.0.6
update version to eblob_0.15.1
Ignored eclipse project stuff.
another skiddie
updates
fix merge conflict fail
Merge pull request #43 from k4n30/master

small one liner :p
removing modules from toc
Adicionando campos não obrigatórios com default vazio ou zero
Corrigindo lugar do .encode para lugar correto
Merge branch 'master' of github.com:TracyWebTech/cnab240
Atualizando campos default
Preenchendo campos controlecob_numero e controlecob_data_gravacao do header de lote cobrança
Preenchendo campos arquivo_data_geracao e arquivo_hora_geracao do header de arquivo
Added bin to git repo, updated javadoc
fixed rerender
make it better
Merge remote branch 'origin/master'

Conflicts:
	joule/templates/create_rfp.html
changes
Merge remote branch 'origin/master'
seasonal menu
Sortable Service
Installer: Use the locale ID to identify the translations.

The locale ID is used to identify the translations in MPC-HC since 9eb359ab3a002706fa0ffabe17846dcd41ff5749 but the installer was still using the old backward compatible IDs.
Made a few minor changes to CLUI including some more default options.
New devise_attr_accessible option

Devise uses update_attributes in its controllers, so fields like :name
and :password should be attr_accessible in your model. If you don't want
them to be attr_accissble, you can use this option. If it is set, Devise
uses update_attributes :without_protection, but doesn't accept any param
not from this list:

config.devise_attr_accessible = [:name, :password, :password_confirmation]
allow unsafe code to compile RealtimeHost
Added README with known issues; adjusted save_alias and build_platform quotes
Fixing Postfix operators and adding Prefix operators, including Negate
Refactor benchmark app to fetch in chunks of full viewport tiles
Add support for specifying a cache_buster URL

The url will be used to fetch a cache_buster value after the given
amount of full viewport fetches.
got rid of all garbage collection runnings
Added exception package in the BPF
Updated TestDataLogger to use the new FileManager
- phpunit.xml for travis was empty for some reason...
- phpunit.xml for travis was empty for some reason...
Changed AI profile from FS2 RETAIL to myProfile.
adding message capability to settings
Merge branch 'rails3_stable' of https://github.com/YaleSTC/reservations into rails3_stable
making branch stable
Merge branch 'commenting' into rails3_stable
Revert "upgrades to rails 3.1 - be careful"

This reverts commit b3d6a557c73ea24d49c377fa5c77d94eb10e860f.
Basically finished with implementation of Permanent Record
adding reservation confirmation email
rewrote validations for rails 3
added rails 3 validation
added minimum length for phone validation
quick fix for bug 26
Rails 3 validation for equipment model

Just changed the validation to validates for Rails 3
working on creating notes for a reservation
Merge branch 'rails3_stable' of https://github.com/YaleSTC/reservations into rails3_stable
User equipment model counter function

Added a function to users to count the number of each model_id
currently checked_out by a specific user
Enabling reservations emails for testing
Merge branch 'rails3_stable' of https://github.com/YaleSTC/reservations into rails3_stable
full reservation confirmation function
working on printing page and removing create view
added print function + css styling
CartItems is almost entirely obsolete now
small edits
created factories for testing and started moving validations
half of the cart validations are in reservation; testing environment created
added first version of available?
working on available/other validations/helpers
fixed spec
all validations written and working; validate_set written and working
testing nearly complete for cartitem reservations
view edited - can add and remove items on the server
almost everything works
commented out redundant code
all validations are in reservation; working on reservation factory
reservation factory works
edited factory and various comments, fixed EquipmentModel's available function
changed Reservation to belongs_to :equipment_model
reservation factory finalized
tests updated
split reservations into cartreservations and reservations with basereservation as the superclass
created CartReservation migration
created requested reservations
created requested reservations pt2
responsive design wip
Merge branch 'gh-pages' of github.com:ZsoltFekete/writings into gh-pages
return statement moved back to reduce
Merge branch 'ptpx-to-merge' of ssh://gnudd.com:222/opt/git-server/ptp-noposix into ptpx-to-merge
synced with last release of the SPEC demo
PTPWRd/protocol.c: added servo reset on link down
PTPWRd/dep/wr_servo.c: now PPS is enabled after syncing is completed
HACK: define a do-nothing pps_gen_enable_output
fixed compilation error on new lm32 toolchain
Also filter based on ethertype
The ethtype is not aligned in the data structure. We need to align it to read it.
Merge branch 'ptpx-to-merge' into new-ipclib
Merge remote-tracking branch 'remotes/github/etherbone-demo' into new-ipclib
README: mark it as obsolete
Merge branch 'ptpx-to-merge'

Conflicts:
	libwripc/wr_ipc.c
Merge branch 'rubi-local'
User signup
Add SSL in production
No SSL for now as we need a certificate
new post, hackintosh in a coma
Handling cache without attributes.

This commit fix issue for that:
./core.py -v import --around 'N60 10.266 E025 00.710' 0.01 do --fetch-details

('#Content .sortables .item-content')[5] was asked, even len(X) is only 3.
Fixed some stupid (read: nanoseconds) in the new Server.
initial commit
Merge branch 'master' of github.com:abelmartin/cuba-demo
a working setup and installation instruction
Merge commit 'bf241eca756e345ebb7342cd91fa0399d668ffbc'
Merge commit 'e29653e5711d8f9a390a2b133a7fe2b372258854'
Merge commit 'de6f1501836ab541ed05e6cef313ac200c044c5a'
Merge commit 'e014e1934e5ab77f944eae4e6a8f5269194112c5'
Merge commit '583343ccf0a94d6dca6a5e5d3bb1b0f06e201d47'
Merge commit '665fadcbe1221afd551c28a134c588c90dc5cd00'

Conflicts:
	INS/test/TimeSheetTest.java
	MainApplication/app/fixtures/DepartmentFixture.java
	MainApplication/app/fixtures/PersonFixture.java
	MainApplication/app/fixtures/ProfessionalFixture.java
	MainApplication/app/fixtures/TimeSheetFixture.java
Merge commit 'dc7b4d0f438484f6dd155e34e86673df5ec4ceff'

Conflicts:
	Holidays/app/models/HolidayRequest.java
Merge commit 'cc9aa7cf3a5df95e5bc0a396ae42310828e92cd4'

Conflicts:
	INS/app/models/Attendance.java
	INS/app/models/AttendanceStatus.java
	INS/test/TimeSheetTest.java
	MainApplication/app/fixtures/PersonFixture.java
	MainApplication/app/fixtures/ProfessionalFixture.java
	MainApplication/app/fixtures/TimeSheetFixture.java
	MainApplication/conf/messages.fr
Merge commit '964aba24581f1841797e1cb5aebffab25f6c2201'

Conflicts:
	MainApplication/conf/messages.fr
Merge commit 'a7e76e8f3c291780b1493473a2a4382c5b2c5241'
Merge commit '184ca2c609529c3d7d8456079bf53e321a5ee633'

Conflicts:
	MainApplication/app/jobs/MaintenanceJob.java
Merge commit '4cabbf1cb1c168825601366cfa97f09f1abd0036'
@
Merge commit 'cb197071e14948de33cb897e864edb7be725e22f'

Conflicts:
	MainApplication/conf/messages.fr
Merge commit 'f53669fe460df79274417902ce6eb60d393178a5'

Conflicts:
	MainApplication/app/jobs/MaintenanceJob.java
Merge commit 'c94e57a80a744baf605ec895b9c1d7f781a773e8'

Conflicts:
	INS/app/models/AttendanceStatus.java
	INS/app/views/tags/attendanceDialogAllDay.html
	MainApplication/app/jobs/MaintenanceJob.java
	MainApplication/conf/messages.fr
Merge commit '0ae97387957514b08193aae5acfae01eec691c1d'

Conflicts:
	MaisonAccueil/app/controllers/DrugCommands.java
	MaisonAccueil/app/views/DrugStores/edit.html
Merge commit '011ed8a3546da5b875a4881790a975a8cf4ba983'

Conflicts:
	INS/app/views/tags/attendanceDialog.html
	MainApplication/app/jobs/MaintenanceJob.java
	MaisonAccueil/app/models/DrugCommand.java
	MaisonAccueil/app/views/DrugCommands/add.html
	MaisonAccueil/app/views/DrugCommands/edit.html
	MaisonAccueil/app/views/DrugStores/edit.html
Merge commit 'ccd794f0385521c779d895f7e1d87af80ee7ba31'

Conflicts:
	Holidays/app/models/HolidayRequest.java
	MainApplication/app/jobs/MaintenanceJob.java
	MainApplication/conf/messages.fr
Merge commit '44cea18c553cf9d96cd2b717b47290fc78d2fe9c'

Conflicts:
	Holidays/app/models/HolidayRequest.java
	INS/app/models/AttendanceStatus.java
	INS/app/views/tags/attendanceDialog.html
	INS/app/views/tags/attendanceDialogAllDay.html
	MainApplication/app/ext/Ext.java
	MainApplication/app/models/Person.java
	MainApplication/conf/messages.fr
example -> express module
javascripts 위치 변경 & 파일 변경
view userlist 약간 수정
merge를 위해 우선 올림
Merge pull request #1 from access-company/JAJE_express_module

Jaje express module
Finished exercises 10.6
Refactored rules signature to take the whole grid rather than just the last updated value
Update the change log.
Sort .gitignore.
speeding up view
Clean up array index
[DF-421] win platform support.
ouath2 -> oauth2
Add google oauth to requirements
add requests to requirements
code
menu created for admin in static html
code
initial changelog as per the mwb created
Merge branch 'master' of github.com:adlakhavaibhav/Minor
Just adding a comment about PSR-0
pushing some final styles
artist _form fix
small cmake fixes
First Commit, added name to README
Worked on Manages Symbol Table
Rename project to Spearson.
working on animation record
modified:   rsc/scripts/extractmerge.sh
 	modified:   rsc/scripts/extractmerge_parallel.sh
modified:   rsc/scripts/collectvols.sh
Commented out css
Merge branch 'master' of https://github.com/ahill1994/Boundary51
Adding dependency for environment when using ORMs other than ActiveRecord
implement close tab
Add a menu to control video options

Note that this version doesn't implement all the features listed in the menus.
Changed text to the opportunity and program section
Lexicon-ified all strings
Unified timeline structure, now resizes properly, fixed seeking.
fix private reports
[L'ultimo guerriero] Added new paragraphs.
Updated the Kyoat.

Signed-off-by: Agasa <megamanx20042002@yahoo.it>
Merge branch 'master' of https://github.com/alethiophile/KBDH-VN
Added a surprised Kanae.

Signed-off-by: Agasa <megamanx20042002@yahoo.it>
Merge branch 'master' of https://github.com/alethiophile/KBDH-VN
Fixed grunt to 0.3.17
Refactored tracking to tracker controller.
Added webstorm project to git.
Jump to last image when new picture arrives
Updating version number & fixing rev from-to order
updated hippocampus simulation script
Config tests, and saving ability
Merge pull request #8 from sdywcd/master

db
Merge pull request #9 from alextao/master

jshop
商品规格修改aop方法
Merge sdywcd-jshop/ostocyjshop 
git@github.com:kalaikaqu/ostocy-jshop.git
fix confilicts
增加关联商品页面
修改了团购实体类
基本完成规格(goods_specifications_relationship_t)后台的增删改
Merge pull request #8 from kalaikaqu/master

基本完成规格(goods_specifications_relationship_t)后台的增删改
商品问题
Merge remote branch 'origin/master'
pc
Merge pull request #10 from sdywcd/master

wow
增加了点在菜单加入订单的功能。
修复了商品修改页面的分类bug
Merge pull request #9 from kalaikaqu/master

修复了商品修改页面的分类bug 
Merge remote branch 'origin/master'
增加了手机端选择支付方式，更新订单操作。基本完成手机端主要功能
整合了dwr3
Merge pull request #5 from sdywcd/master

android_jshop
better definition of vimpager
Update lib/foursquare/venue_proxy.rb
Fix for wrong import
Add a new WiFi Direct version of the Simple Service

This app is nearly identical to the normal Simple Service, but is also
able to automatically approve WiFi Direct group formation.  It
contains a WifiDirectAutoAccept class that encapsulates the group
approval code, but this class depends on APIs found in Android API 16.
This service operates with the normal Simple Client.

Change-Id: Ifd051ce8e992f2a252148dd8fbd4dd644e17afa4
remove
Merge branch 'master' of github.com:alpcanaydin/codelate
Latest versions of tariff-format
Missed an os import.
LPS-27251 Add Display Styles Export/Import support
Improve Ext DLFileEntryType Service
Add: inverse_of option
Merge pull request #2 from paulgillard/master^

Add: inverse_of option
Added room module that switches on the air conditioning for Andrei and switches it off for Diana. (#53)
Merge pull request #54 from ami-lab/f/#53-room-module

Added room module that switches on the air conditioning for Andrei and s...
Added end of line to services.txt so that last service also gets restarted. (#14)
nfs tips
cpufreq_pegasusq.c + cpufreq_interactiveX.c: Tuning
compressed/Makefile: set asflags-y := -Wa,-march=armv7-a
vfp/Makefile: Change -mfpu=softvfp+vfp to -mfpu=neon
board-tuna.c: Undervolt vaux3=2900000, tuna_vusim=2000000
clockdomains44xx_data.c: [IVAHD] Disable HWSUP mode and save power
omap_twl.c: Undervolt omap4_iva_pmic:ret_volt=800000, omap443x_core_pmic:ret_volt=800000
omap_twl.c: Core OFF Volt set to 0
OMAP4: PM: fix overconsumption on OFF mode

The wrong value of CM_L3INIT_CLKSTCTRL.CLKTRCTRL = 2 (SW_WKUP)
has been stored in SAR during omap4_sar_save() execution and
causes power over consumption on OFF mode due to C2C operation.
It happens because the L3INIT CD need to be enabled during
omap4_sar_save() execution for proper USBHOST module context storing.

Problematic use case:
1) OMAP goes to sleep,
2) modem wakeup the C2C, the EMIF but the MPU is still sleeping
(as expected)
3) Modem release all his constraints, C2C is turned to OFF.
4) but OMAP never reach again OFF while we don't wakeup the CPU
(by a keypress for example), sys_clk is already ON and voltages
are not equal to 0. (OPP 50 for CORE_3 and retention voltages
for both VCORE1 and VCORE2).

As WA overwrite CM_L3INIT_CLKSTCTRL.CLKTRCTRL = 0x1 (SW_SLEEP).

Change-Id: I2e453c07f61bab28a7213dd66044fd41a021961b
Signed-off-by: Arthur Cassegrain <a-cassegrain@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Patch Set 1
cyanogenmod_ak_defconfig: Enable CONFIG_CC_STACKPROTECTOR
board-tuna-wifi.c: fixed_voltage_config microvolts = 1800000
cyanogenmod_ak_defconfig: change CONFIG_FRAME_WARN from 1024 to 1048
Kernel Version: ak.109.jb.eva03
Added two basic classes for the project
Some fix on user
Adding spec methods
ingen boostrap i error page
First implementation of Devise authentication
Removed default gse ID
Merge branch 'master' of github.com:andrewdyates/geo_api
fix by_ref()