labofsahil/github-event-dataset-2012 huggingface dataset:
Minor layout bug fixes
vise andre
Added textual answers

	new file:   answers.txt
Added installation and running instructions

	modified:   README.md
	modified:   trade/app/controllers/authentication.rb
Replace core to 3.2.12
Replace core to 3.2.12
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
Added phpunit config file and CONTRIBUTE.md
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
Added phpunit config file and CONTRIBUTE.md
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
Improved readability & simplifications
Upd license
Errirs
adapted to the new describeOutoscalingGroups() interface
Iteration 1: I dropped the "Enroll in mandatory terminations" feature,
will implement this next
Dc21-246 Modified initial user task to be configured by a cap task and be much more secure
Removes the notion of Simple or Smart Textual Context.

There is only one textual context service implementation. It exposes now tow methods: SetRaxContext, SetCaretIndex.
Removes TextualCommandListener
The TextualContextService impl. listen itself to KeySent / StringSent event
little refactor
Fix config changed bugs
Merge branch 'p-wordpredictor-oneservice' into p-wordpredictor
Max suggested word config change UI reaction
The TextualContextArea plugin reacts on prediction zone creation / deletion
Centralize PredictionZone / PredictionKey creation if a dedicated factory.
Add a PredictionZoneCreated event.
Fix KeyWidth Issue
keyboard editor : drag n drop + resize via viewmodel only

first steps to zone/key creation
Adding key/zone creation
Handling disappearing images + some treeview improves
Added test to verify user.
Added test to verify target verified URI.
Merge branch 'master' of github.com:IronFoundry/vcap-client
Merge pull request #12 from Adron/master

Added unit tests around active cloud, user verification, and target URI.
Initial load

Original Files
Add mysql2
Add pg
Closes #38 (moved beginning-of-line asterisk stripping in doc comments from the lexer to the comment processor)
Fixed a little bug where ctors were called with the constructed class as the proto instead of the class that owns the constructor method.
moved vsc to lib/vsc and added _logtoSomting + logging to syslog
Update easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
Merge pull request #2 from boegel/patch-1

fix download URL for readline
Fixed the checkbox functionality
Config fix , nvram location fixed
Updating to the new domain
eliminadas
Adding Olivia's outline work
Merge branch 'master' of github.com:JumpstartLab/curriculum
Displaying experimentation section in section list
Removed 'simple' from the example declaration
P3: Update balancer policy for compatible with addtional NodeGroup topology
Added Hibernate configs and user mapping user class
link to espn.html
ClassDiagram Exported as Image
shifting everything arround
implemented methods getNext() and getPrec() in LineImp
Fixed some dynamicobject code for use with editor
All properties changed to get/set for Editor

They're only ever used inside decal or from the editor, so why not.
Median cut algorithm implemented for color quantization
Choose champ + create new build completed
Introduced AbstractSequencer, and started on dynamic addition of Sequences
Fix some javadoc errors
Find sector with most mosquitoes
more changes
Lights do not target objects captured by other lights
more cleaning and db
added entity urls
resolve conflicts
Project Added
Added correct hardware config
Working on Timer gated chains
Timers gating code written
PWM init done
Timer initial phases set correctly
Added data output over USB
USB serial input with timeout and scanf
PPG autobrightness
Added comments on future work
Both APB busses to 42MHz, All timers at 84MHz
Added gating script
Merge branch 'master' of github.com:Laurenceb/Chibi-Spectro
Debug USB in progress
USB debugging in progress
USB, polled ADC and PWM working
Added pressure setpoints implimentation
Hardfaults in halInit
Latest ChibiOS
something very bad in halinit
Base package, doesn't really do anything at this point.
Merge pull request #2 from pmotschmann/master

Base package
Removed non-player-killed entities
Added /opchat and /adminchat commands
Dados salvos não podem ser acessados.
Tweak a desc string in the rakefile
Revert "Take advantage of new error handling in Factory"

This reverts commit e6612e1a93f5f5a3018bb1884834b6c03ea247ea.
Update dependency version on mouse gem
Add SystemWide.desktop and SystemWide.status_items
Add Application.dock and Application.finder

And also Application.notification_center,
though it seems a bit broken.
Add Application.frontmost_app and Application.menu_bar_owner
Only set MOUNTAIN_LION_APPKIT_VERSION if it is falsey
Prep for release
cambio de nombre de tabla de informacion institucional en pagina
nombre de tabla de campania
Tweaked the youtube section with the colors and unescaped the HTML
sharing: indentation fixes
www-plugins/mozilla-gnome-keyring: version bump
games-arcade/waking-mars: initial import

see http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=tree;f=games-arcade/waking-mars;hb=HEAD
fix describtion
fix icon
games-arcade/waking-mars: use openal 1.14.0

see http://www.tigerstylegames.com/wakingmars/support/
x11-drivers/nvidia-drivers: sync with gx86
A slash too much.
alteracao page index
alteracao face do header
Update space_chase/src.js
GUI framework optimization
Removed println
Merge pull request #363 from miniME89/gui

Gui
bootstrap.php utilisation du loader par défaut de composer
Update README.md

project added
Les surfaces Ammos sont correctement orientes
SetGameClass, GameExample angepasst.
fixed indention
uses Timeout to stop exhaustive lua code
builds new gem 1.2.1
Fixed Model_Crud reference examples.

Signed-off-by: Frank de Jonge <info@frenky.net>
Merge branch '1.1/develop' of github.com:fuel/docs into 1.1/develop
Added all the connection params to DBUtil

Signed-off-by: Frank de Jonge <info@frenky.net>
Added DBUtil::set_connection docs.

Signed-off-by: Frank de Jonge <info@frenky.net>
Merge branch '1.1/develop'
Merge branch '1.1/develop_japanese' of github.com:NEKOGET/FuelPHP_docs_jp into 1.1/develop/japanese
Input Scope Exam angepasst
93: Subject Pflichtfelder
90: Textbox Topic vergrössert
Added active record functionality to Location and Speaker entities, refactored usage of location properties.
Changed to use StringClob because of issues with NH sometimes truncates the value to 4001 chars before persisting it, relates #737
A proper fix for "NSB.Testing, ExpectTimeoutToBeSetAt w/ timeout in the past", fixes #508

Moved saga logic that decides if message(s) should be deferred or not(if date specified is in the past) to the Unicast bus.
Add user_id when claiming venue

D'oh!
Remove redefined have() view
More branding
Add page to list all venues claimed by a user

The `venue_claim()` view now redirects here on success instead of the home page.
ABN needs a trim on GIRO accounts
Giro accounts are padded with some spaces. I don't know if this was deliberate, but it seems unnecessary.
Parse ABN-AMRO continued statements
Merge branch 'trimAcct' of https://github.com/NanneHuiges/jejik-mt940
More banks than just ABN-AMRO use 28C for statement sequence numbers
Add installation instructions
Merge remote-tracking branch 'upstream/master' into accountHolder
Improved contraAccount and accountholder
SEPA is now recognized too (bic/iban + name), and better accountholder support is added
Purging a None from prior activities
Removed the workaround for the "Bukkit blocks Zombe" issue, improved the
NoFall and SurvivalFly checks.
Hot fix (fight/angle): check worlds of locations.
Adding UserCreation and UserChange forms
Refactoring structure of the module to consume compiled arrays of closures instead of implementing an own compiled class (which is affected by singletonitis)
Twitter updated, Shoutbox semi-working

Messages can be posted, displayed after refresh.
Cannot be deleted, no limit on amount of messages.
0.5.1

Fixed static information writing.
Also put in a few comments and got bored.
Reset Password Controller overlays on button click functionality added
Merge branch 'master' of github.com:OpenComm/OpenComm-Group
BUG: potentialFreeSurfaceFoam: incorrect entry
ENH: turbineSiting: demand load library
ENH: tutorial: extraneous entries
BUG: pointMesh: use MeshObject form
STYLE: dynamicCodeContext: Doxygen parsing
Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.1.x
Updated Henksat Settings May 22 2012
IMPROVED : Define dimensions of page
Added score and json levels
Don't automatically enter debug repl on error
Add 'resume' function to debug REPL

It's not really any use if there's an actual error - the tasks
are too fine grained. But may be useful in the case of
a voluntary debug repl for a program that otherwise executes.
fixed: symbol detection

rogue words and functioncalls were being detected as symbols
Add README.txt.
Fix .gitignore to ignore .nuget folder.
added method option to action
added method option to action
Added javascript routing
Started Javascript Bud Roles SPI
Some basic black/white rules
Add black/white arithmetic rules and demo
Fix distributivity rule

Comes with example for testing.  This takes a _long_ time to rewrite.
Save some extra rules that might be useful.
Combine all GHZ/W rules into one directory
Move Red/Green rules into their own subdir
created error and maintenance html, created test error page
changed overlay overflow-y to auto
users do not need to be signed in to view invoices; added sign in link to header
Minor refactoring
Refactoring
Unix
Merge pull request #12 from RWOverdijk/hotfix/minor-refactoring

Hotfix/minor refactoring
Report bug if dead man walking...
Make helper not nullable.
whitespace and types deletions HTML cleanup
bone: v3.2-psp6

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
README : supression des chevrons (lien vers le stk)
Torrent sync bug fixed
Peer speed fixed(double -> int)
Peer speed fixed(double -> int)
Matriz com memória dinâmica funcionando.
Especificação do trabalho
small fix

update stats after setting new lv
Calculation about Item Abilities added

arp, mrp, tenacity
# Special statistics not added

also some fixes about item class.

not tested...
task file added
RC-1
removed cherrypick
added connect/disconnect logging
do not send the email parameter with a charge. also, load the slice function for tests.
Fix typos in MIT license
insaneRatio is now just a reciprocal of saneRatio
got rid of paranoidRatio and naiveRatio as they are not being used
see ofbizosgiconfig.doc
Updated SK80.enhance and SK80.mixins.add
bionic: Stack pointer/signal race condition.

Move the stackpointer so a captured signal does not corrupt
stack variables needed for __thread_entry.

Change-Id: I3e1e7b94a6d7cd3a07081f849043262743aa8064
linker: Increase maximum shared libraries loaded to 192

Increase the maximum number of shared libraries loaded per
process/SO_MAX to 192 from 128.  The mediaserver process
can load more than 128 shared libraries due to media HAL
and associated libraries.

CRs-Fixed: 387489
Change-Id: I21988cca7234f208ae80e1dff9a404458cb604a7
Bionic/libm: Prefer branches and VFP ABI

For internal functions set gcc attribute "aapcs-vfp" for ARM
and use -fno-if-conversion to prefer branches over predicated
instructions (improves performance on architectures with good
branch prediction).

Change-Id: I365e9508bd3babb0bb06fc5de127c1ae17445bcc
Bionic/libm: add assembly versions of sin/cos

Add assembly versions of sin/cos with integrated remainder pi/2
calculation.  Directly extracted from binary libm.so compiled with
__ieee754_rem_pio2 calls inlined.

Change-Id: I9a999c01cea92aace9df7be9ad8f90f150040375
Bionic/libm: Remove extra vmov from sin/cos

Move integer representations of x bits on the integer side rather
than moving them to and from the FP registers.

Change-Id: I1d0800730d7553a47c462ee2a0cc044ffe62eb20
msm7627a: Enable neon optimized memove and pow functions.

Define SPARROW_NEON_OPTIMIZATION flag so that neon optimized
memove and pow functions are used. Also add Corresponding
definitions in make files.

Change-Id: I12089fc7002e3ec294e63632bd84e395fbd24936
Bionic/libm: Pow optimizations and bug fixes

Use VFP calling convention for pow_neon handoff function by default.
Fix register usage collision between two different polynomial
coefficients in pow_neon.  Remove conditional execution in pow_neon
and replace with branching.

Change-Id: I254617940b2787297aff2ab97dbf45c11e6a2b08
msm8660: Add neon based pow() function for Scorpion

Add #define to enable neon based pow() function for msm8660.

(cherry picked from commit f795151ff5dc4eb622b2630cb6f42353db4a1b55)

Change-Id: Iab0f30eb0583c30bcfd6940a23f47e98ffe075df
Nieuwe versie van voorbeelden

Proberen te achterhalen waar de lokale commits blijven in GIT.
Laatste bugfix
deleted .dummy_file
Epic win!
More comments, contracts for native functions, formatting
Added assetation for linearized model.
Deleted one unused function.
Added the "user completed that achievement" functionality.
Undid hardcoded statements and made it work\!
removed old one
Add app-terminal/kmscon-5
Flightgear HIL working on Ubuntu
added Rascal airplane model for flightgear which also includes a 3D model (from http://flightgear.org/legacy-Downloads/aircraft-2.0.0/)
(re)enabled xplane hil (flightgear hil and xplane hil should both work)
Added missing initialization
terrasync support on ubuntu, fixes #1
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into hil_flightgear
re-enabled terrasync for all operating systems, might produce (non severe) errors on Windows or OS X
Fixed roll / pitch / yaw rates outputs for XPlane 9
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol
HIL: reorganization of UI
HIL Flightgear Configuration: added aircraft option
Quick add of joystick buttons values in Mavlink manual control messages
Merge pull request #175 from jonathanFR/master

Add of joystick buttons values for manual control
Fix a forgetting in precedent commit adding joystick buttons management
Merge pull request #176 from jonathanFR/master

Fix for last commit
Merge pull request #171 from Susurrus/master

Modified qgroundcontrol.pri for Windows VS builds
Updated MAVLink
Fixed param loading
Merge branch 'master' into hil_flightgear
Huge step towards usability goals: Graphic vehicle configuration in a first (ugly) sketch
System type is set to generic in constructor of UAS.
Signal waypoint test passes.
Signal waypoint test passes.
Deleted all but one file in settings. I kept the ParameterList.xml because that is referenced in ParameterList.cc. Though having the ParameterList.xml does not affect it anything, it is probably good to keep it.
In data, deleted all but the kinect.cal file because that one is used in Freenect.cc.
Moved the images folder to the files directory. Changed all of the paths to images to files/images.
Merge branch 'signalWaypoint_unittest_fix' into organize
Put libraries into one libs directory under qgroundcontrol. Changed the neccessary files with references to those libraries.
Merge branch 'signalWaypoint_unittest_fix' into reorganize_qgcunittest
Put qgcunittest into src. Left the .pro file in the root directory.
Added a line in qgroundcontrol.pri to include QtTestd4.dll so that the
unit tests will run on windows.
Test
Merge branch 'rm_data' into dataandSettings
Merge branch 'rm_settings' into dataandSettings
ParameterList.xml in data.
Merge branch 'reorganize_qgcunittest' into memCheck
Fixed memory leaks in the unit tests.
ClModified unit test.
Memory leaks fixed in unit tests.
Merge pull request #148 from jjhall89/memCheck

memory leaks fixed fot unit tests
Allow for step completion in display step
fixing ftp and opp

  1. bt-obex cannot work as client because bluez changed their D-Bus API,
  ftp-client and opp-client from obexd are used instead
  2. running agent before bt-obex server to accept secure connections
  3. cosmetic fix of BT_Proximity.sh
  4. Minor fixing in BT_Init.sh and BT_Exit.sh

Signed-off-by: Vita Preskovsky <vitap@ti.com>
new query
Merge remote-tracking branch 'origin/master'
Starting to eparate GoogleUser from OdenkiUser using gae-sessions.
OAuth authentication for GoogleDocs uses OdenkiSession instead of google.appengine.api.users .
OdenkiUser and Spreadsheet were changed to use GoogleDocs.GoogleDocs.
Merge branch 'install-as-a-middleware' of git@github.com:TakashiSasaki/odenkiapi.git
Obtaining access token for Google Docs using OdenkiSession.
GoogleAuth works at least.
Merge branch 'master' of git@github.com:TakashiSasaki/odenkiapi.git

Conflicts:
	GoogleUser.py
	OdenkiUser.py
	appengine_config.py

appengine_config.py includes cookie_key (SESSION_SALT).
GoogleUser is pure class definition not providing HTTP response.
OdenkiUser doesn't include information coming from other authentication providers.
temporary commit to merge it with github/master
Merge branch 'remotes/github/master' into install-as-a-middleware

Conflicts:
	GoogleUser.py
	OdenkiUser.py

/GoogleAuth?revoke=1 works.
Readme modify
first commit
first commit
docs soon
first commit
first commit
Fixed bug that would cause crash when ordering marines into deep space.
Fixed bug 28.
Still no success fixing show/hide issue. Thought I had an insight
regarding invalid constructor parameters but it was false.
Got a max size set on the rhs panel.
Think I've spotted the problem. Committing broken code to record
history.
Removed all Qt code from project.
Began reworking it as a PyGame project.
Expanded window to be more robust and added basic draw method.
Now draws Window's widgets.
Added widget abstract class.
Started work on an instantiation of Window and Widget.
Moved UI abstract classes into their own package.
Implemented basic viewport.
Transplants from sports and teams.
Seems the last package description was lost. Odd.
More fitting. Installs now.
Added a few more files. Stuff's still coming together.
Added jsPDF, early PDF-printing support, license/readme updates
Move to libretro.
Move around.
Libretro.
fixed causes of some PHP notices in start scripts of admin CP pages + some more pedantic stuff
Add a brief note to GettingStarted indicating creating more spaces.

A lot of people create new users for each space they create,
so presumably it needs to be more clear that you can have more than
one space.
Merge branch 'master' of github.com:TiddlySpace/tiddlyspace
Update test_search to reflect increased number of tiddlers
server with simple persistent data (quite unsafe)
Mediawiki 1.20.0
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
Merge pull request #7657 from e000/master

[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
Core/Spells: Send SMSG_SPELL_[START/GO] also for spells with SPELL_ATTR8_AURA_SEND_AMOUNT
Core/Spells: Fixed SPELL_AURA_CAST_WHILE_WALKING
Core: Fix more typos (thx Expecto)
Core/SAI: Fixed SMART_ACTION_SET_RANGED_MOVEMENT
Core/SAI: SMART_ACTION_NONE is not a valid action. Also accept SMART_ACTION_SET_RANGED_MOVEMENT as a valid action.
Core/SAI: Fixed build, i need new glasses.
Core/Vehicles: revert 95152d57539064d8278e323899290cba2fb2b0cd and 95152d57539064d8278e323899290cba2fb2b0cd

Sorry about troubles caused, hed reason to think formula was wrong, but it wasn't. However there is part of the code that needs to be improved I describbed in this commit as TO DO: Connected with: #8195
Core/Vehicles: Missed change
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Core/Movement: Remove MOVEMENTFLAG_FLYING on fly aura unapply as well as _CAN_FLY
DB/SAI: Fix flags on previous commit
Core: Fix some codestyle
Cleanup $color
ok please ignore it..
prev. commit was wrong, now is correct one.
CSSStyleDeclaration::removeProperty() returns removed css text.
added button overlays with ability to adjust transparency
added dummy file url resolver
tweaked thread delay time
Merge branch 'master' of ssh://frankfurt/cores/git/wasp/wasp-config
modified task delay time
json result itemsCode ㅊㅜㄱㅏ
Show correct AI names, even when AI list differs from the host's.

Fixes ticket:3226.
Dispatch クラス -> モジュールに訂正
testing psd commit
Updated NoTouch Skin

some Bugfixes
Migrate to add time and scenario columns.
remove api from 005
fix 005
fix random names
Merge branch 'master' of https://github.com/XanderStrike/PolySurvey
update todo
Merge branch 'master' of https://github.com/XanderStrike/PolySurvey
Merge branch 'master' of https://github.com/XanderStrike/PolySurvey
fix question names
Merge branch 'master' of https://github.com/XanderStrike/PolySurvey
Added SFML Font class.
MAJ diverses (se connecter -> espace client), ...
Makes sure that the path of the creating ends with "\".

Needed for the unmarshalling to find out it it is a folder-creation or a file-creation
Merge branch 'master' of github.com:Yndal/BDSA-Project-2012
Parsing of for, unless, until and while.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
licej_style
Added a simple message for the help command line action
Removed the field parsers for the time being, first I need to get a
minimal web server running.
Added a simple File serving system, what i really should do is separate
it as an interface so that any sort of content system could be produced
to just tied into the file system, also need to put in some mechanism to
get mime types.
Fix endpoint adding: remove wrong string to integer conversion.
String with hexadecimal values becomes 0 after this conversion.
Merge pull request #18 from ninja-cat/fix-endpoint-issue

Fix endpoint issue
Edit user details, vieweditbasal profile

new userdetails file and modified vieweditbasal profile.
Validations have been added for all form fields.
Cleanup whitespace throughout the codebase.
Adding UsersController to Users plugin.
Änderungen rückgängig gemacht

MedalKonstanten sind wieder wie zuvor.
fontawesome icons deaktiviert
Adam added his name
Movendo arquivo de configuração para padrão de distribuição
Movendo arquivo de configuração para padrão de distribuição
Retirando verificação de instalação
Corrigindo identação
Merge branch 'master' of https://github.com/adirkuhn/Expresso-Livre
Adicionando ambiente de testes para php 5.4.4
update merge args
Added menu piece for Creating new Project.
Making input consistent with other dialogs.
Got New Project creation working.
Making a new project rebuild status show up.
Linking folder with new project.
Getting interface strings in the localization engine.
Changed Rebuild to a button, to match other buttons that are coming.
Got Delete App working
Removing debugging.
Adding strings to french.
Making sure list refreshes when rebuild is done.
Tweaking readme to commit branch.
Se agregaron generadores y nuevos comandos
Editor: added library input directory for AGS.Native DLL
Initial updates to revert to jboss-javaee-web-6.0 BOM. AEROGEAR-190
preparing release 1.0.0.M2c
adding info for EAP testing
In-memory tweet format
added zoom controls to google map. see https://google-developers.appspot.com/maps/documentation/javascript/examples/control-options . Close issue #16
Changes for Registration Page
Updated Mockup..
Merge branch 'master' of https://github.com/ajayjadhav/iDonateBlood
Stupid typo in tweet link.
making animate.css optional.
experimenting with importing settings in core at the top
creating a way for users to make their own javascript statements for their plugins.
invitation accept with tos redirect to users/show
UTF-8を使う際のマジックコメントを追加しました
新しい画面を作る前に必要なアクションのルートのテストを追加しました。
ルートのテストをパスできるようにconfig/routes.rbにルートを追加しました。
勤怠入力画面のスペックを追加しました
勤怠入力画面を実装しました
出社と退社のアクションのスペックを書きました。テストはもちろん通りません。
$ rails g scaffold Work person:references started_at:datetime finished_at:datetime
rspecが生成したビューのテストが失敗するので、成功するように変更して実装もそれに合わせました。
$ rake db:migrate
実行するのが面倒なのでautotestを導入しました
PeopleControllerのfinishアクションのテストで使用しているPerson#worksの関連を実装しました
更新後のアサーションを行うためにデータをロードするようにしました
startとfinishアクションを実装しました。PeopleControllerがWorkモデルに依存しないようにしています。
PeopleControllerから参照されるPersonモデルのstartメソッド、finishメソッドw実装しました。
勤怠入力画面のリンクが間違っていたので修正しました。
New version of Weka.
Added some node modules, update manifest files. The manifest files will need correct URLs.
arreglado pcode Intervida
Created placeholder header
20/10/2012 home

cambios del fin de semana… logos
home 28/10/2012

cambios del fin de semana
Finished Chapter 6 - Modeling Users (including secure passwords)
[TwigBundle] Fancy output for twig:lint
WIP: summary() with add. results
merge to cooper-mobi-ali v0.2 team-beta.
Testing that create users rake task creates users, sends emails to both new and already extant users, and sets the name to the first part of the email address when it is in the format a.b@c
replaced comment with pro-forma text using a radio button
working on dashboard view and moved import data from migratorator into db folder
dont need the migratorator data in reviewomatic
working on view for dashboard and created dummy data rake tasks
updated view
Merge branch 'master' of github.com:alphagov/review-o-matic
Resolves merge conflicts
Resolves more merge conflicts
Added options to the settings
Maximum Length of audio recording and maximum number of recordings per report
Added Audio Recording Functionality
Some restructuring of Harris-Laplace
Harris with Response seems to be working.
Update android/res/raw/sessions.json

Actualizacion del JSON enlazando  sesiones con speakers
fixed icon mismatch for fitbit steps, github connector bug and weight unit conversion for fitbit
@PrePersist must be unique (didn't know that)
null checking
02/06/2012 10:58
Finish the signup page
base struct++
Integrating Echonest buckets
Event Source main class.
fixing wrongly coded "has_country_modifier" in events/malayanconversion.txt
adding README file for future documentation
Replaced Devise with Sorcery
Improve re:create rake to separate non-aho corasick enzymes
not sure
Add Analysis and Draw of domains
Added all test cases to the ldap test suite.
Refactoring to the LDAP store impl. Closing search results after the processing.
Removed unnecessary class.
LDAP store query refactoring.
implement JPA password validation
Merge branch 'master' of github.com:picketlink/picketlink
implemented password credential update
implement DefaultCredentialHandlerFactory, refactor IDM config
remove redundant updateGroup() and updateRole() methods from IdentityManager, replace usage with update()
Refactoring LDAP query support.
fork apache amber
Merge remote-tracking branch 'upstream2/master'
Refactoring LDAP query support.
minor checks
Merge pull request #15 from anilsaldhana/jpa

Minor checks
oauth idm changes
Merge pull request #16 from anilsaldhana/jpa

oauth idm changes
hover bug

sumaisiaupliuso ir minuso hoverius prie "edit photo" :]
pataisiau
** Shared ckc-demo-php source code into the scm
CRUNCH-134: Move CrunchRuntimeException to org.apache.crunch
CRUNCH-135: Remove sample and sort from PCollection interface
CRUNCH-136: Two one line fixes: FileSourceImpl is not abstract, and WritableType's constructor is public.
Updated readme, to include some screenshots
enhance adaptec support
Shape clear fix
SortSite recommendations
added grade school attribute to student
 On branch master
	modified:   app/models/student.rb
	new file:   db/migrate/20120510081802_add_grade_school_to_students.rb
	modified:   db/schema.rb
added parsing and viewing of grade school graduated from
 On branch master
	modified:   app/models/student.rb
	modified:   app/views/students/show.html.erb
Atualização dos formulários da página "contato";
Styling Readme.md
pushed navbar design tweaks
Support for multiple simultaneous LED faders
reduced overview point size
getting synset data is working

TODO: draw bar graph
bar graph working
bar hover working
default binder template working
merged readme
Corrected the page concat build script.
Upgrading live packages stage.
Add new MarketEntryTypes and LastSequenceProcessed to MarketMessage
set magit-item-highlight

Otherwise, switching from zenburn leaves it as zenburn-bg+1.
Merge pull request #46 from hdhoang/magit-item-highlight

Set magit-item-highlight.

- Otherwise, switching from zenburn leaves it as zenburn-bg+1.
Add support for gaug.es
client shouldn't have to authenticate on a video_by call
Correct the earlier optimisation.
change sdk version
tab to spaces
made a couple of changes to drive category algorithm
yaml requires
Also remove man-pages for eliom.3.0.0-beta2
Added cache resetting for when visitors add comments
Corrected CSS
Incorporates UMLS entity tagger into pipeline and adds entity chunk
features for each entity type.
fixing UI and backend problems for the currently being listened to in secitons
added dummy update_adj_yaw()
fixed errors in install instructions
initialize static null vector

Signed-off-by: Bjørn Mork <bjorn@mork.no>
ne pic
Log 404s
Merge pull request #9 from abackstrom/dev

Log 404s
Adding a unique id column for analytics (slickgrid)
Merge branch 'master' of github.com:plymouthstate/plymouth-webapp
Added pool_timeout option
DAMMIT MAN
update README for DJ. fixes #33.
Merge pull request #34 from akshayrawat/development

update README for DJ. fixes #33.
var dump addImageFromResource method
try shorter name.
some work on the docs re: 26 & 29
unset bug fix (there could be a nocompain switch)
used the between operator to get the proper date range for last_calibrated_on. Much simpler than using julian dates
show feedback
gitignore in config
add eco driving page
rename online test to online test drive
add eco driving images on topmenu and page
added Restaurant object
changes app icon to something more restaurant-y
metadata
Sensor context menu configured
Made some cosmetic changes to proposals and view proposals lists.  Added a presenter column in the proposal lists.  Also added the presenter's name in the proposals's page.  Added a list of proposals that have been assigned to the meeting in meeting.php.  Made style changes in printable-minutes.php.  More changes will be made later to accommodate the new changes made in the database pertaining to assigning a proposal to a meeting id.
Starting from scratch. Commented out old code for reference.
Moved around packages and made some skeleton classes
Yeah, pretty much finished with this front page.
Add a StaticPages controller
Revert "Add a StaticPages controller"

This reverts commit 8a9bb65b5912ac55ed12b658e209a38304b14006.
Revert "Revert "Add a StaticPages controller""

This reverts commit 4ef6aff6d26658d3183f947fb559ac1a13dbb2ad.
Finish static pages
Moved station data into a resources folder.
Updated station and podcast data.

--CAR
Limit the number of podcast detail entries for performance reasons on mobile.

--CAR
Adding scaffolding for pages
Organized layouts and admin nav
README file with installation instructions etc.
Make the hook cope with an empty ignore_codes variable.
Remove unnecessary nodeconnect dependency
Include commented out code that needs to be executed after the profile runs
Slight adjustment to fix the way the group subtype is stored.
Merge pull request #153 from holtzermann17/master

importing improvements
Fixed ssh login issue
Added HSV support
add main program
adding range thresholding func
segmented out all 3 colors tags
prep to optimize LabThresholdingByRange
optimized range thresholding
finished optimizing of range thresholding algorithm
clean up contours
implemented extracted tag centers
finished essential stablization of point
fix overlayBeforeExpander and overlayAfterExpander if it is an iFrame
overlay
Update django to 1.4.2
Merge pull request #53 from jvc26/upgrade-django

Update django to 1.4.2
Limiting Microposts to 140 characters
first version of fixed block/thread
First stable version
Remove unnecessary code
Merge remote-tracking branch 'origin/fixed_block_thread_size'

But, there are something crazy.
Updated usage at top
Updates to class generator, by-hand updates to demographics and related documents. New class for xs:normalizedString.
constuctingSite
version 0.5
Remove support for v1.6 feature files

The code has been ifdef'd since 2008 and just makes reading the code
harder and there is no reason we would want to enable it again.
More v1.6 compatibility cleanup
Ignore generated files
Make char view palettes docked by default
Load default resource file at startup

If a $prefix/share/fontforge/resources/fontforge.resource file is
present at startup it will be loaded.
Update changelog
Continue cleaning warnings.
This time I marked as UNUSED some function paramters that have to
be there, because these functions have to conform to given signatures.
Add inter-intersection measurements to the measure tool.
Bad for-loop grouping in sfd.c

This should clear up failures in the Caliban.sfd Python tests
(tests/test1001.py.in in my autotools branch, or parts of
test/test1001.py in the master branch). They occurred if and only if you
did not have device tables enabled.
Ignore backup files, too.
make --without-python work
Merge pull request #8 from mskala/master

One line to make --without-python work
Add docs for measure tool intersections feature 
Use cairo drawing for all windows

Cairo is pretty fast these days and will give us smoother UI elements
(smooth arrows, circles that really are circle etc.) If this is not
accebtable, we have more than way to turn cairo off completely.
Remove the rectangle base of submenu arrows

They look nicer this way (more close to GTK ones as well).
Remove unused leftover from development.
Don't use SelectedFgColor for unselected glyphs

When cairo is enabled, unselected glyphs use the color of selected
glyph. As far as I can tell those lines make no sense at all, but their
effect was masked because we were not using cairo for fontview.
Merge pull request #5 from jhps/measure-tool-intersections

Add inter-intersection measurements to the measure tool.
Merge with master, and add more .hgignore.
untracked PyZ3950_parsetab cruft
tag daily releases with date when packaging
Language slides
Change to use standard boilerplate
Remove old init file
Added augeas tools
Params
Merge branch 'develop' of https://github.com/chrismckinnel/Grabagame into develop

Conflicts:
	src/app/config/parameters.ini.live
Update README.

Based on deploying to Cedar rather than Bamboo.
added mobile-web-app-capable to get rid of browser chrome
fixed fatal typo in the original code

Signed-off-by: Christopher Su <christophersu9@gmail.com>
http_session_vars error

Signed-off-by: Christopher Su <christophersu9@gmail.com>
added: RTorrent.get_api_version()

https://github.com/rakshasa/rtorrent/commit/f1cd0f47801596d114e7f9f9defb673d4690a4ed
generate report controller, add to navigation
Add service boolean to credit types, and service calculations to users
count tours not tour hours, remove images for heroku, improve yearly report
add yeti as submodule of cf-release

using the same format, "git@github.com:cloudfoundry"

Change-Id: Ica2e03f23f426b83af11df793c56ce196db09ebd
Signed-off-by: Pin Xie <pxie@vmware.com>
Updating dashboard job to send logs to syslog aggregator.

Change-Id: Id71952af0be0710b9fd6e8650c6a33c52b58c071
Merge branch 'built'
Merge "add yeti as submodule of cf-release"
Disable IPv6 for dea_next

Change-Id: If3e751f21077b7069f0429e324a1d528fd61e3b3
Update the UAA to 1.1.2

Shortlog

Chloe Jackson (1):
      Updates for IE

Dale Olds (1):
      Added support for --vmc option to uaac

Dave Syer (3):
      Update the version tags for 1.1.2
      CFID-410: remove clients to override config for bootstrap
      CFID-410: move override flag to client config map

Change-Id: Ie0e0d7c95c545c129f49270aeffb4235957cabe8
Merge "Updating dashboard job to send logs to syslog aggregator."
Merge "Update the UAA to 1.1.2"
[WIP] build with linaro 4.7.2
[WIP] ARM: use Graphite Optimizations on all optimization levels (and thumb)
Add Ryan to About page
fixed bug in question histogram code -- histograms counts now reflect number of responses per option, not per word occurance for multiple choice questions
Cleaning up,
Cleanin up
Added linmk to license of CodeIgniter
Changed edit.erb to edit.haml
active admin heroku stuff
add lock to teams
Changing CentOS6 bootstrap to grab the latest rubygems version
button alignment and space issue in mobile no
Only display the latest samples for resident ratio data
Fixed the views. Added _all_dbs.
Reformatted
Increase max. time alarm can be active to 10 hours
FIxing problems
Merge branch 'master' of https://github.com/cs225/CS225FinalProject.git
cleanup of caches on page reordering
cleanup
1.0.4 finalized
oops v1.0.4
wirebox fix
fixes
lots of goodness
Merge remote-tracking branch 'upstream/master'
fixed shift reduce conflicts
Update vendetta.php
First very basic tweet visualisation
Banner replaced by new one
More Human readable

Fixed some stuff, added some stuff, changed some stuff, and marked some
stuff.
Added support for binary numeric literals
Added --devel option to Play formula

This will install the latest development version (2.1-RC1) with:
  $ brew install play --devel
Update master
Merge pull request #1 from yvangg/patch-1

Update numbering in Scoreboard page so that duplicated positions are ignored.
More strict input type guards.
clear adsr implementation
Tidy up resultstable code
Draw deptrees and sentence tables using XML rather than JSON
Add tags and their attributes, closeable, to the resultstables
Use inview instead of waypoint, and draw deptrees in an offsetted drawing class attached to body
Reflowed the botchive so it's just icons now.
Formatter can now support keyword arguments, known as 'options' in the public API
Remove str call when passing asset to HttpResponse
Version 0.0.5, fabric.js 0.9.2
Bundle
small rearrangement of text
adding test data and starting some more extensive testing
fix jdbc-prefs dependencies
Updated to clojure 1.4

Added support for dong literal.

Unit (heh) test for dong literal.

Documentation of dong literal.
forgot to add these in the ignore! :O
Moved source organization around again
Fixed build path
Removed dist dir, added by mistake
Added dist directory
Fixed unassigned id
Tweaked signing script
juggling the generated build.xml
Kohana 3.1 Request::instance() changed to 3.2 Request::current()
refined physics-based movement
testing
testing...
Converts to DDM Component

Breaks scaffold off to a DDM Component and implements
composer functionality.
Deprecates getPrimaryKeys in Base_Row

Zend Framework 1.12.0 adds a getPrimaryKey method to
the Zend_Db_Table_Row_Abstract class that Base_Row
extends. Base_Row previously had a getPrimaryKeys method
that called the internal _getPrimaryKey method.

getPrimaryKeys and the ZF's getPrimaryKey now do the same
basic thing. This commit updates getPrimaryKeys to take a
useDirty and then routes the call to getPrimaryKey. It also
marks getPrimaryKeys as deprecated.
Removes comments about ZF-9501 bug

ZF 1.12.0 fixes the problem with ZF-9501 which resulted
in generated code losing a closing bracket if two closing
brackets were next to each other.
5 pix fix
bump junit version
chain test rules execution so hornetq server can be started before vertx
Added public and private tags
Adding some comments on why we dont use this.
Removing more stuff and adding a comment.
Removing more unused junk.
Se cambia extension de la base de datos de .txt a .bd
Merge branch 'master' of https://github.com/dmontenegro/mirringomdp
updated heli loot

updated heli loot
Remove readme with rails_composer output
Updating docs and travis tests to use the new CLI
Include QueryString for navigation
Sub-features within a feature will only be instantiated once - no recursive madness.. :)
Introducing HttpStatus for being able to explicitly say a specific HttpStatus during a service call
Fixed fluentvalidation references
implementing alerts
LPS-27677 Fix junit tests
LPS-27677 Source formatting
LPS-27735
LPS-27735 Source formatting
LPS-27796 Source formatting
LPS-27783 Add method isInTrash() to ServiceBuilder entities with status
LPS-27783 ant build-services
LPS-27783 apply to DL
LPS-27783 apply to existing code
LPS-27783 add method to WorkflowedModel
LPS-27783 Source formatting
LPS-27698 Make the spring context startup configurable by adding extra Spring config files
LPS-27698 Cache the entities created during the execution of persistence tests and delete them at the end of each method test
LPS-27698 Make the persistence tests run after all the other tests because a different spring app context is required
LPS-27698 Source formatting
LPS-27698 AUTOGENERATED
Regenerate
Logging
LPS-26266
LPS-27828 distinct slows query and is not needed
beien
test商城首页测试
test商城首页模版
Merge branch 'master' of github.com:doyouhaobaby/needforbug
lua doesn't clone values for local vars

Code which tried to restore offsets didn't do anything since old and
self point to same values
fixed typo
you can enter orders and they are logged
change to sendAsynchronousRequest method
Static site from master 33cfba6
Added header and footer sections
Merge pull request #49 from duijf/master

Dutch translation
Merge pull request #48 from purikas/master

Estonian translation, v1.0
cfrthg
Update your_projects/Pertemuan_02/HelloOpenGLExample.cpp
undid makefilepath change
Handle Wikicode contexts correctly.
Properly handle newlines in template names with named parameters.
Committing first time
Add data = true as default option
add .gitignore > strage config
admission_of_observers
related meetings
Merge branch 'cms' of github.com:eaudeweb/cites-meetings into cms
related meetings in registration form
Merge branch 'cms' of github.com:eaudeweb/cites-meetings into cms
Change-Id: I000000003
added examples from the book professionnal javafx 2
changed readme file content and encoding
Client/Server: first version
auto x axis
css re-factoring
Махнати са кавичките, които ограждаха израза "гола дума".
add keyboard arrows control for change to next or previous slide
ASoC: twl6040: Move ignore_pmdown_time to driver struct

It's set unconditionally.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Conflicts:

	sound/soc/codecs/twl6040.c
Revert "net: wireless: bcmdhd: Fix WARN_ON(!res->pub.channel)"

This reverts commit 8cd79da1832949cf5257ffbe4671462f31d247dd.
Tests are now compatible with Python 2.6
Added note about Python compatibility
removendo tet
controller route
home controller
secret key default
session config default
bands config
simple class for picasa
auth controller to auth a Google API
better handling of various input formats in readGame()
Change ‘SYNOPSIS’ to ‘DESCRIPTION’ and make usage output verbose

Normally Perl programs have a SYNOPSIS section in the POD area.  This
patch changes the name because Pod::Usage shows both SYNOPSIS and
USAGE under the name ‘Usage’, which looks slightly confusion to me.  I
would rather break the tradition and name the section DESCRIPTION so
that it has a unique name when the user sees help output from running
the program.

This patch also places the call to pod2usage() inside of a function to
keep the main “show help and exit if needed” logic a nice one-liner.
Show the short command-line arguments in the README
Make it more clear in the README that --repo is optional
Use the full name of the GPL in the ‘LICENSE’ POD section
Format paragraphs in the POD

This patch contais no changes except formatting.
Name the package ‘App::Github::Issues’

This seems like the most appropriate namespace.
Add ABSTRACT to Makefile.pl

It would not build on my system before this patch.
Add a simple shebang line to the Makefile

I honestly do not see this ever been necessary, but I also know of no
reason to not include it.
Set Makefile.PL to be executable
Change Makefile.PL to store my repository as additional meta info

Squeeks uses his own URI for the fork of the program when providing
extra meta data.  This patch changes the URI to my repository.  This
is not an attempt to belittle him or dimish the value of his
contributions, but for the time being I expect more expects to may
copy than his.
Add installation instructions to the README
Merge branch 'ejmr/app-github-issues'

* ejmr/app-github-issues:
  Add installation instructions to the README
  Change Makefile.PL to store my repository as additional meta info
  Set Makefile.PL to be executable
  Add a simple shebang line to the Makefile
  Add ABSTRACT to Makefile.pl
  Name the package ‘App::Github::Issues’
  Format paragraphs in the POD
  Use the full name of the GPL in the ‘LICENSE’ POD section
  Make it more clear in the README that --repo is optional
  Show the short command-line arguments in the README
  Change ‘SYNOPSIS’ to ‘DESCRIPTION’ and make usage output verbose
Update the version nmuber after my small changes
add gbfw
Modifique archivo gitignore y agregue archivos de proyectos de netbeans
* beginning class layout for game project
* updating logging library
* signal wiring
fixed bug z-indez
Update the sample project to use Clojure 1.4.0 (Issue #113).
Translated new phrases to German, added missing phrase for system setting articles.article_show_longtitle

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
[#7517] Add ability to duplicate Articles Container
[#7419] Add ability to duplicate single Articles
[#7309] Use placeholders in extension_packages reference
[#7313] Ensure that the archive URI is always set prior to notifications during a publishing event
[#7550] Fix JS issue with Create New Article button
[#7559] Display ID of Article in articles grid
Update build version/changelog
Update tagLister to 1.1.7
Update Quip to 2.3.0-pl
Merge remote-tracking branch 'enigmatic-user/german_translation' into develop
[#7560] Fix issue with Quip during installs
[#7544] Fix issues with friendly_urls setting
[#6373] Add ability to control the structure of the URLs generated for articles
Update Quip to 2.3.1-pl; update Archivist to 1.2.3-pl
added line, minor
Merge branch 'master' of github.com:erichkleung/sp12_collab
add client_bridge hotplug script to arpnat patch
Separated iOS and android

Splitted the app into two different HTML files, one for each OS. Included both cordova.js files for the respective OSes. Included index.html file to advise user to navigate directly to their OS page
Merge branch 'master' of github.com:es92/CordovaAPIExamples

Conflicts:
	index.html
move passphrase and _verify_passphrases to AndroidSigningMixin. Prepare for signing support in mobile_partner_repack.py.
Remove amd support. Moved into in AppDK.
Fix gadget js async loading problem when using requireJS
Merge branch 'master' of https://github.com/explivre/ExpressoLivre3
Merge branch 'master' of https://github.com/explivre/ExpressoLivre3
Task#4350 - Allows everyone to delegate and change the attender
Task#3986 - Status changed on an event opened from notification email are not persisted.
Task #4169 - New Translations and Fixing other translations
Task #4009 - Fix problem when refreshing account data when user updates his account signature (ImapAdapter).
Fixing Messenger deploy errors!
Fix message move error caused by null pagination.
Merge branch 'IMAPAdapter' of github.com:explivre/ExpressoLivre3 into IMAPAdapter
task#3174 - Respect function signature when calling it - scope: Felamimail_Backend_Cache_Imap_Folder::get($_id, $_getDeleted = FALSE) - target: Felamimail_Controller_Folder::getInstance()->getSystemFolders()
8.18log
Bessere ReplyTo-Behandlung, wenn man auf einen eigenen Reply antwortet.
Dateiupload-Foo jetzt per Drag&Drop in eine extra Dropzone. So viel bequemer...
Account#validate_credentials gibt im Debug-Modus das aktuelle RateLimit aus.
Gravatar is only contacted on production environments. This enables use to set a default image in dev mode.
Direct README users to installation instructions on guides.fatfreecrm.com; Added more resource links.
Allow custom events to be handled by Papertrail formatter, and autolink if unrecognized by I18n. Display shared time_ago within <small> tags
Bump version