labofsahil/github-event-dataset-2012 huggingface dataset:
Added logging of who created modified or deleted to MY_Model.
Fixes #365 ModuleBuilder: Fixing no-db module creation - the pull request was for 0.5 - thanks though
Fixed issue with very strange css media='1' problem on module_css, also added static to non-static methods
Merge branch 'develop' of github.com:ci-bonfire/Bonfire into develop
Added id's for form labels to be valid.
Adding explains back into profiler and other small updates.
Merge branch 'develop' of github.com:ci-bonfire/Bonfire into develop
Fixing duplicates issues. Not using dups at the moment.
Fixing update module lang call
Users: Fix display of the user form and remembering the data entered by the user in the error state, adding form validation for role_id and timezone
Users: Fix display of deleted users
Users: Add purge functionality
Fixes #386: Moving Password Strength settings into the DB and are editable in admin/settings
Settings: Extend the 'set' method to insert a setting, Adding a delete method
Fixes #385 Seperating the keyboard shortcuts into individual setting records
Adding brackets
Refs #343 Use the Users language is there is one set
refs #343 Allow the user to choose their own language
refs #343 Allow the admin to choose which languages are available
refs #343 Add language labels
vim-rspecプラグインを追加
uh oh forge did not like my last commit on README.md and package.yml
Removes redundant compilation step in pre-push hook.
Fix minor issues such as: change color of top navigation, change size of social icons, re-organize the books. Changes footer-books-featured links to /books
Added parameter to stop or not testcase on js errors or warnings.
[maven-release-plugin] prepare release quickgeo-parent-0.1.0
not working on all tests yet
Add Read Me

add a read me
add a few libraries
bump
Fix issue #303 FilterLocList

999d3c1b added a filter on the errors list that checks for key/value
valid:1 in each element of the errors list. sh.vim doesn't use
SyntasticMake to check for errors so needs to add {valid:1} to each
result.
Use SyntasticMake in sh.vim

Simplifies sh.vim by using SyntasticMake, also fixes #303
Add syntax checker for ft=zsh

The current sh.vim checks for ft=sh and #!/bin/zsh  This add a checker
specifically for ft=zsh and changes sh.vim to call the same code.
Remove wrong call to runtime in wrong file
Adding the HTML5 <souce> tag to valid tag list …

The HTML5 <source> tag throws an error when using Tidy since exceptions
have been made for audio and video, we should also support the source
tag which can exist inside these calls.
add support for elixir language
Merge pull request #353 from rramsden/topic/elixir

add support for elixir language
Merge pull request #351 from bryankennedy/html5-source-fix

Adding the HTML5 <souce> tag to valid tag list …
Merge pull request #350 from kisielk/master

Added support for multi-line error messages in go.vim
Merge pull request #325 from rbrown/sh

Fix issue #303 FilterLocList
add licence file

This is in response to #326
Merge remote-tracking branch 'rbrown/sh2'

Conflicts:
	syntax_checkers/sh.vim
sh checker: extract out some logic into functions
sh: relax makeprg to catch errors that werent getting parsed

Errors like this were not getting picked up:

    /tmp/foo.sh: line 4: syntax error near unexpected token `)'
    /tmp/foo.sh: line 4: `!!"£!")£!"£echo "foo"'
move SyntasticCheckable() down with the other public functions
Use 'go test' to compile *_test.go files as 'go build' does not
Script/BlackRockSpire: Remove unused code. Change some timer.
Fix the Marker madness.
set number of cpus to be used by goroutines to number of physical cpus
Finish unit tests for remote.py

Finishes the unit test suite for remote.py.
add .dir_colors.old
backend-proto: providing login/logout links
show/hide fixup
Fixed small bug caused by early binding to touch device
merge lxc-0.8.0-rc2
# fix
# upd gem.lock
# more informative messages
remove unnecessary ln
Merge branch 'dev'
fixed item generation bug
minor improvements
ticket: 7110
subject: Fix password reuse check with cpw -keepold

When we check for password reuse, only compare keys with the most
recent kvno against history entries, or else we will always fail with
-keepold.

This bug primarily affects rollover of cross-realm TGT principals,
which typically use password-derived keys and may have an associated
password policy such as "default".

Bug report and candidate fix (taken with a slight modification) by
Nicolas Williams.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25801 dc483132-0cff-0310-8789-dd5450dbe970
columnas nuevas para cuenta
created rotateClockwise class
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git

Conflicts:
	RubiksCube/src/cube/Cube.java
	RubiksCube/src/cube/Logic.java
merge
Minor cleanup for some compiler warnings.
msm: audio: qdsp6v2: Update ACDB driver to use ION

Update the ACDB driver to use ION instead of PMEM
driver to allocate memory.

Change-Id: I8934ccf9c75db5921f51aac2f518c342948678cc
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
msm: audio: qdsp6v2: Replace PMEM with ION in Audio Decoder drivers

ION is replacement for PMEM which is less complex with better
reference counting. Hence ION which is a superset of PMEM is
used to allocate memory in the audio decoder drivers.

Change-Id: I0c9458b902bad169d6fcc36dfc66d538c00a6e22
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
msm: audio: qdsp6v2: Replace PMEM with ION in LPA driver

ION is replacement for PMEM which is less complex with better
reference counting. Hence ION which is a superset of PMEM is
used to allocate memory in LPA driver

CRs-fixed: 341467
Signed-off-by: Chaithanya Krishna Bacharaju <chaithan@codeaurora.org>
(cherry picked from commit ce3a8ca434a26a28686410ef13b5c4919c3a5609)

Change-Id: I32fc2db0be0c1768ffc1b009203f739e720a7473
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
msm: Asoc: audio: Migrate to ION from pmem, dma alloc

-Voice driver and RT proxy driver are using Pmem and
DMA alloc. Migrate them to use ION memory to save memory
and avoid stability issues.

CRs-Fixed: 369303
Change-Id: If58b69b9f8b7b03661a36451c1a5c27885fbf976
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
ASoc-msm: Modify ASM drivers to invoke ION APIs

Create ION client and allocate buffers based on
the client handle and free the buffers when no
more needed.

CRs-fixed: 349170
Signed-off-by: Swaminathan Sathappan <Swami@codeaurora.org>
(cherry picked from commit bdc5508dbc5e9bd624eb34e5e254b510baf4294f)

Change-Id: I7c748946e98567995f10f7aea0bc6e0b0454a802
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
msm: board 8960 and 8064: Increase ion heap size for audio.

After migration from pmem to ion, we need to
reduce EBI1 memory for audio usecase and make a
corresponding increase the ION heap size.

Change-Id: I98ba83cff86760be078ef1d8a7e7a03b9e71db8d
Signed-off-by: Jay Wang <jaywang@codeaurora.org>
d2: Reserve memory for ION audio

Change-Id: I2a7203c94d2966a947009f46c72f22dc66aa26bf
bam_dmux: Add d2usc workaround for modem crash.
msm_fb: display: add writeback mode for mddi on 7x30

Add support for BLT mode in the MDP4.0 overlay architecture while
downscaling to more than half of the source dimensions to avoid
underrun issues.

CRs-Fixed: 313524
Change-Id: I3ead5329edbef36697c26d55e6cf8d8cd316fdbc
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
msm_fb: display: Keep fb1 for MDP version < 4.0.2

For better memory usage, fb1 memory allocation is removed for
targets like 8960 which support BF pipe and true mirroring but
required for targets like 7x30 and 8660 which still needs fb1
for border fill.

CRs-fixed: 364669
Change-Id: Id741223a0107e356b9164b582aa1f901caa21988
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>

Conflicts:

	drivers/video/msm/msm_fb.c
msm_fb: display: Fix Rename MDP IOMMU context bank names

MDP IOMMU context banks do not correspond to the input
processing pipes like RGB and VG. So the context banks
are renamed based on port and number.

Change-Id: Iff90aec4e4aae9b3350f8e043c94995d72e50817
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
msm_fb: display: Configure MDP clock table based on DSI Video pixel clk

To avoid display underrun issues, configure the MDP clock table's rate
according to DSI Video mode panel's pixel clock frequency by 1.15 times.

Change-Id: I9bc864a754c2d51c9d86ece79863820eb72cdae8
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
Fix home.html.erb (_signin_user)
Merge branch 'master' of github.com:kurotaky/mameblog
MapLayout er mer netbeansvennlig.
Remove grafiker
Update plugins/git-plus/git-plus.plugin.zsh
Increased the boss hitbox
cleanup unused css
color steps
correction d'une synthaxe
First pass as improving document/code separation in xbox

As a first step, much of the separation here is simply recast as using
\xbox_... code functions rather than \__xbox_...

At the same time, some left-overs from the picture mode code are removed and
the docs are slightly reordered.


git-svn-id: http://www.latex-project.org/svnroot/experimental/trunk@4317 de43f980-851b-0410-b2f7-c40aca1f87e0
Remove another now-unused code block


git-svn-id: http://www.latex-project.org/svnroot/experimental/trunk@4318 de43f980-851b-0410-b2f7-c40aca1f87e0
Tell mongodb cli to pretty print JSON output by default
Preserve References and In-Reply-To

Still not sure that this actually makes threading work, but we'll see
fixed: honorroll - empty schoolyear
"Added ability to set callbacks for interrupts that get an argument. This argument can be the instance that needs to handle the interrupt, or just a random argument you might find useful later. Suggestions from mbolivar and iperry from pull53 on libmaple were taken into account.
Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
"Callback versions of functions now take voidArgumentFuncPtr. We can probably use voidFuncPtr instead, but this way people can see that the function expects something different. Existing functions haven't changed in signature.
Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
"Added two examples for using attachInterrupt. One shows the use of a global function. While the second shows the use of a static class method as the event handler. Both work on Maple REVC
Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
"Changed tabs to spaces. Changed some braces placement to match existing examples
Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
Whitespace fixups to EXTI files.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
ext_interrupts.cpp: Doxygen fixups.

Keep the Doxygen in the header as per Wirish conventions.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
EXTI examples: whitespace fixups.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Merge branch 'callback_interrupt_handlers'
ViewLocator returns null when nothing matches
Extract viewMatchesPattern
ViewLocator is okay with having non-TextViews
branch1
sldjfsld
modify for density.
Make local classloading the default option
UI Cleanup
Modified the entire dir structure to use modules
Changed the structure of views
Draft thing improved for pages with urls in title
folder important
If there is only one area in selection box - select next field
fixed save, creation with update of config
loading system is back
Tweak app
backup Mon Sep  3 07:35:05 UTC 2012
Tue Jul 31 10:10:03 CST 2012
vim-colors 2012-08-03
Clarified error messages for creation of png strings.
Merge pull request #1 from ryanfox/patch-1

Clarified error messages for creation of png strings.
Colour -> Color
OCD styling

if/switch/catch other spacing stuff changed
s390: Add thunk layout documentation for S390_CC_OP_DFP_RESULT_64.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2600 8f6e269a-dfd6-0310-a8e1-e2731360e62c
s390: Fix disassembly for ADTRA, DDTRA, MDTRA, and SDTRA.
Spotted by Maran Pakkirisamy (maranp@linux.vnet.ibm.com).


git-svn-id: svn://svn.valgrind.org/vex/trunk@2601 8f6e269a-dfd6-0310-a8e1-e2731360e62c
s390: Fix IR generation for DDTR and MDTR. These insns do not modify
the condition code.
Spotted and fixed by Maran Pakkirisamy (maranp@linux.vnet.ibm.com).


git-svn-id: svn://svn.valgrind.org/vex/trunk@2602 8f6e269a-dfd6-0310-a8e1-e2731360e62c
Fix typos. Should really use __func__ instead.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2603 8f6e269a-dfd6-0310-a8e1-e2731360e62c
E:42161 [!] Bug: Old MD5 hash built with HMAC key. Fixed.
Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x
show city only on profile
cleanup
add cjk_content on search index
mapapi
user profile and search fields
fixed extra header showing under main header

- added check for empty variable
site beautification

- added query function to remove and replace default value of input field "edit-location" on focus and blur event
site beautification

- fixed positioning of go button for location search in header region
- fixed input field widths for location search header region
- changed font colour in input fields for location search in header region
- fixed collapse functionality of schools detail page. now has the ability to have more than one item open at the same time.
- schools detail page: profile-view-menu button region layout now reflects that of the design screens
Add city to featured tutor and exchange partner.
Commit bookmark to profile tutor and exchange partner when not logged
in.
global css for facetapi block
Merge branch 'master' of https://github.com/liveitchina/sites.git
preprocess block
added auth to stmtsMore tests
Changed menu graphics from MS4C to use Graphics.png
Merge branch 'master' of github.com:lluchs/Clinfinity
StringRef-ify Binary/UnaryOperator::getOpcodeStr

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165383 91177308-0d34-0410-b5e6-96231b3b80d8
Use a single note diagnostic for all the precedent/parentheses warnings.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165384 91177308-0d34-0410-b5e6-96231b3b80d8
Python bindings: Add missing availability kind.

Patch by Leo Liu, test case by me.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165374 91177308-0d34-0410-b5e6-96231b3b80d8
Python bindings: fix typo.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165375 91177308-0d34-0410-b5e6-96231b3b80d8
Add test for a construct we currently reject, constant-evaluating a load from a constant string.  Given that gcc doesn't accept this, we should continue to not accept it, even though it was accidentally supported by clang for a brief period.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154564 91177308-0d34-0410-b5e6-96231b3b80d8
modern objective-c translator. Fixes a mis-translation when
of a __block struct object. // rdar://11230308


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154566 91177308-0d34-0410-b5e6-96231b3b80d8
Record visibility pragmas when we see a tag declaration. We might use it
to build a type before seeing the definition.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160339 91177308-0d34-0410-b5e6-96231b3b80d8
test/Driver/crash-report.c: Small tweaks. 1) Use %t instead %T for TMP. 2) Set all of $TMPDIR, $TEMP and $TMP, or a certain host might set $TEMP.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160342 91177308-0d34-0410-b5e6-96231b3b80d8
[Win32] Rework crash-report since r145389.

  - lib/Driver/Driver.cpp, tools/driver/driver.cpp: Exit status should not be propagated, although clang driver should catch exceptions.
  - test/Driver/crash-report.c: Add REQUIRES:shell for now.
    FIXME: setenv should work also on Lit.InternalShellRunner.
  - test/Driver/crash-report.c: Remove XFAIL.

Thanks to Chad, To point out the issue.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160343 91177308-0d34-0410-b5e6-96231b3b80d8
check for existence of key instead of checking secret twice
oembed video info
Merge pull request #3260 from panckreous/twitter-conf

check for existence of key instead of checking secret twice
Merge pull request #3418 from Raven24/nicer-oembed

oembed video info box
update-gems
Merge pull request #3424 from justindthomas/update-fog

update-gems [ci skip]
updated 41 locale files [ci skip]
make serbian translation available
[SECURITY FIX] please update your pod ASAP
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
Add Code Climate badge
somehow some dirty state made it into my merge :(
Merge pull request #3432 from brynary/master

Add Code Climate badge
should fix the mobile toggle for the case: desktop --to--> mobile #3299
also, (possibly) fix tablet issue #3421, + tests
Merge pull request #3433 from Raven24/fix-mobile-toggle

fix some mobile/tablet related stuff
make the rake task for cleaning up mixed-case tags more verbose [ci skip]
Clarify warning shown when single_process_mode used in production
Merge pull request #3434 from Raven24/fix-tag-cleanup

make the rake task for cleaning up mixed-case tags more verbose
Change root_url to root_path
Merge pull request #3440 from movilla/master

Change root_url to root_path
Merge pull request #3436 from L2G/master

Clarify warning shown when single_process_mode used in production
Se han organizado mejor los controles y se bloquean los controles nativos
del dispositivo
génération du code java avec jaxb

Signed-off-by: Collet Lois <colletlois@gmail.com>
make the upload look pretty with bootstrap.
Updated mpg123 decoder binary to v1.14.2 (2012-05-12), compiled with GCC 4.6.1.
Don't check for elevation on Wine. It seems Wine always runs the process elevated (tested under Wine 1.4 on Ubuntu 12.04).
Added monitor, memToReg, regToMem
cleaned up a bunch of unused plugins / commands / settings
Delete the new line.
Merge pull request #1 from lrtfm/test

Test
beginnings of a ferpa required checkbox
building front-end validation; beware, this is still broken
while this works, I need to change the appearance of the warning
this works; now for some small optimization
adds FERPA compliance confirmation check...
removes unecessary if....
rearranges warning/checkbox order; removes unecessary <html/> attribute
removes cruft
cleans up old intermediate var
temp vim swap file got committed by mistake
adds server-side form validation and failure-to-agree notification
Small changes to better match gradebook exporters
Merge pull request #10 from lsuits/ferpa-warning

Ferpa warning
unlinking users
adding 1st unlink test (not passing yet, due to errors during association
Bug fixes
Added password protected version of the chat to branch "private"

This version of the chat is protected by a password. The default
password is "yourPasswordHere", you can change it in index.php line 10.
Updated README.md
Updated README.md with tips how to make the chat more secure
Fixed CSS bug
Fixed README.md
Added private version to branch master (in /private)

The version of the chat that can be protected by a password is now part
of the brach master. It's located in the folder /private.
Merge branch 'private'
Added /private and updated README.md
#610 - preenchimento de links de navegacao corrigido e melhorado.
Adciona amberjack ao projeto
Luke: Adds comments to changes
remove internal TODO file
[^] added mails
added LSKBaseTableViewController
changes and updates that wasnt committed
Complete icon set included
Added test files
Merge branch 'master' into morris2

Conflicts:
	MocoApplication.xcodeproj/project.pbxproj
update project settings to make unittests running with clang compiler
Action Bar Sherlock done without split
9.8 @13:00. Scanner käytössä
9.8 @13:00. Scanner poistettu käytöstä. Jos vikalla siirrolla tulee suora, ohjelma ei enää näe sitä tasapelinä
removed redundant code
some micro optimization to rendering
micro optimization
new build
코드 수정 및 LTW 관련 코드 삭제
made a new design
more typos and corrections
Merge branch 'doc' of github.com:magnuskiro/it2901 into doc
more typos
Merge branch 'doc' of github.com:magnuskiro/it2901 into doc
Fix a template view.
Fix a language.
Fix a template view.
Fix a language string.
Merge pull request #985 from Balleno/patch-1

Fix a template view.
Merge pull request #986 from Balleno/patch-2

Fix a language string.
Merge pull request #987 from Balleno/patch-3

Fix a template view.
Merge pull request #988 from Balleno/patch-4

Fix a language string.
Merge remote branch 'upstream/master'
Update version information to reflect 3.0 development
Mirage: Some template improvements. Added/Edited some missing CSS classes in views.
Mirage: Announcement style quick fix.
Merge pull request #764 from coder4life/master

Mirage: Some template improvements. Added/Edited some missing CSS classes in views.
Mirage: Quick template fix.
#742 Category Subscriptions are missing in frontend
Undefined variable email in KunenaViewUser in mirage template
#742 Category Subscriptions are missing in frontend (update mirage)
Merge pull request #767 from coder4life/master

Mirage: Quick template fixes.
Merge pull request #768 from xillibit/bugs6

Undefined variable email in KunenaViewUser in mirage template
#742 Category Subscriptions are missing in frontend
Mirage: Separated the animation property into its own class.  Few fixes.
Merge pull request #770 from coder4life/master

Mirage: Some template improvements. Added/Edited some missing CSS classes in views.
Merge pull request #769 from xillibit/bugs2

#742 Category Subscriptions are missing in frontend
profile linked to image on item show
Updated Framework after merging and changed loading of it in theme
Users and Group management
added eepromMap
Created EepromMap obj, fixed read/writeEeprom to actually work...maybe.
Update swig/python bindings.
Symbol#hash
[s1527] Add a bunch of unMaxTargets spell target limits from  R2-fork.

Authors for these fixes: mns, michalpolko, PSZ, fallenangelX, rsa, mosst, przemratajczak, reamer
And hopefully no forgotten!

Signed-off-by: Nighoo <nighoo@gmail.com>
fixed pdf content type error
rows_per_page=rows per page
precompiled
back gem for excpt_not
put link check in tasks
with assets:clean
change example config to hipchat instead of campfire
Merge branch 'master' of https://github.com/markolson/linkbot
# Fixed tests
+ Added kudos treshold properties to Niche
+ Added theme properties to Niche
* Changed validation reporting (now in Intoru)
Deleted old tests
Fixed (?) loss ratio curve computation
QA test update
Removed obsolete parameters
added tests for aggregate losses and conditional losses
pylint fixes
Disabled asserts in optimized builds
whoops, shouldn't always be dinner time
git: Add .nfs* to gitignore.
Set name and abstract to keep dzil build happy
Add preview/question/:id endpoint

Show a real preview of the question.
Fix MANIFEST.in syntax to avoid creating broken distributions; bump version to 0.2.2
Merge pull request #2 from slinkp/master

Fix MANIFEST.in syntax to avoid creating broken distributions; bump version to 0.2.2
table align!
promoting native nodes, demoting iframe
GROOVY-5522: Add array DGM variants for find and findAll to assist Static Type Checker
GROOVY-5522: Add array DGM variants for find and findAll to assist Static Type Checker
GROOVY-5526: VerifyError using assertEquals
     - there was an error with vargs algorithm, which forgot to test that first arguments matches when the number of arguments of the method call corresponds to the number of arguments of the method
     - Object version of a method was preferred to the primitive version although the primitive version was available
vimrc: better colorscheme(solarized), tweak some visual settings
add cherry -v option
better aliasing, comment out completion settings
added playing card files
Merge remote-tracking branch 'origin/memo' into tom
added proper images for interations so far and lots of scale tweaks. also added ballotbox interaciton
added story end callback
Merge remote-tracking branch 'origin/tom' into memo
added story names
adding textlabels
wed afternoon for memo to pull
something
merge origin/tom
mani flowers
Modification pour le theme par defaut.
Ajout d'image
qtjsbackend: fix native dependency

Also fixes the broken qtjsbackent-native recipe

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Merge pull request #6 from levonmaa/qtjsbackend-native-fix

fix qtjsbackend-native build
qtbase: disable xcb

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
move qtbase specific stuff from qt5.inc to qtbase.inc

* qt5.inc should be used by all qtmodule.inc
* add missing PACKAGES in qt5.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qtdeclarative: use common qt5.inc, fix invalid PACKAGES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qtjsbackend: use common qt5.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Pretty much done\! No known bugs
Capture the versions of all the packages I was using when developing this.

Captured with bin/pip freeze | grep -v vboxpanel > requirements.txt.

Note that currently the Makefile will not use requirements.txt, instead it
will try to get all the latest versions.
Add extra send
changes in views.js related to joined_date --> birthdate
Added comment markup to showMediaModal
Removed unused event handlers
Added delete comment to InstaAPI
Merge branch 'master' of https://github.com/michaelsacca/tabs
Adding keymaps for window navigation
Adding clock to tmux status bar
Improve dlopen support on mingw

Not all mingw build environments have libdl.  And those that do often
only have it in dll form which would have to be distributed with the
application.  So allowing use of the builtin version of dlopen in
dvdread is useful. This patch does the right thing if dlopen is not
found on the system and it adds a configure option to force use of the
builtin dlopen.

It also seems that building dlopen broke at some point.  #includes
pointing to the wrong places.

Patch provided by John Stebbins (stebbins AT jetheadev DOT com), thanks!
Detect physical drive or image on Windows w/ mingw

It's purpose is to detect if an input path is a physical drive (on
windows), and if so attempt to open it as an image.  The current code
will only attempt to open the path as an image if the path contains no
directory components (e.g. "X:" or "X:\").  So if the path instead is
"X:\VIDEO_TS", it will fail to open it as an image and instead open it
as a directory tree and css decryption will not work. This makes the
behavior more similar to what happens on other platforms.

Patch provided by John Stebbins (stebbins AT jetheaddev DOT come),
thanks!
correccion en lo que se muestra en los servicios ong de un paciente
test pattern matching on class literals
JBRULES-3420 ModifyPreviousTuples should avoid creating HashMaps
Merge branch 'modifytuples'

Conflicts:
	drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
Merge pull request #107 from mdproctor/master

modify previous tuples no longer uses hashmap
Fix compilation error of Mark
delete obsolete surefire plugin overwrite
Rename *IntegrationTest that should not run in the maven phase integration-test, but in the normal maven phase test to a name that does not end with IntegrationTest
Merge ExternalSpreadsheetCompilerIntegrationTest and ExternalSpreadsheetCompilerUnitTest into a single test ExternalSpreadsheetCompilerTest
 (Needed for: Rename *IntegrationTest that should not run in the maven phase integration-test, but in the normal maven phase test to a name that does not end with IntegrationTest)
Rename *IntegrationTest that should not run in the maven phase integration-test, but instead run in the normal maven phase test, to a name that does not end with *IntegrationTest
fix typo in test name
[JBRULES-3365] reimplement KnowledgeBuilder's undo avoiding Package cloning
fix failing MBeansMonitoringTest
[JBRULES-3263] make constraints jitting (potenially) asynchronous
Tests for JBRULES-3425: KnowledgeBuilder fails to build rules with
BigDecimal\BigInteger constraints comparing to zero
[JBRULES-3426] use ExecutorProvider instead of manually spawning threads
BUGZILLA-771193 json unmarshaller ignores QueryCommand arguments
[JBRULES-3263] fix MvelConstraint clonation
fix disconnectedHandle usage
[JBRULES-3263] fix EvaluatorConstraint clonation
[JBRULES-3427] when cloning a GroupElement also clones the single Patterns inside it
Added a -d option that appends "-dev" to the end of the symlink.
my feature detect was busted
Finished some cleanup.  Resolves issue #2
Outsource JS to CDN
Changed pattern match, \w doesn't match unicode characters
Set migrations to use innodb and utf8
CLOUDIFY-1074 Added start machine event details and added stop machine events. Upgraded XAP version to support new events
CLOUDIFY-1035 first service controller commit
fix compliation error
fix compliation error
CLOUDIFY-1035
CLOUDIFY-1035 add documentations to AttributesController and to ServiceController
CLOUDIFY-1035 initial commit of tools project.
CLOUDIFY-1035 remove the AdminAPIController from the documentation and fix some other issues.
GS-803 Build version advanced to 2495-77
GS-803 Build version advanced to 2495-78
GS-803 Build version advanced to 2495-79
GS-803 Build version advanced to 2495-82
GS-803 Build version advanced to 2495-83
GS-803 Build version advanced to 2495-84
GS-803 Build version advanced to 2495-85
GS-803 Build version advanced to 2495-86
CLOUDIFY-1111, Changed expired image id with a new image id of a windows
2008 serverx64 with no additional services included.
GS-803 Build version advanced to 2495-88
GS-803 Build version advanced to 2495-89
CLOUDIFY-1112, fixed FileNotFoundException thrown because The pem
file is not found in path on ec2-win. The .pem file will now be taken
from the teplate's absolute path when starting the management server and
not from the gigaspaces environment home dir.
Remove unused libraries and plugins (for Japanese)
Cleanup Makefiles
Add a rock view and experiment WTForms
Update TODOs comments
Added author notations in de.tud.cs.st.vespucci.interfaces
最新の php-mode.el 追加
Added default crud controller and views
commiting cause i want to
commiting
deleting stuff
edits on SOPs
forgot one file
Making it so any \*.*\* Type files are handled by popwin
new codes for simulation study and correct the calculation of pmsnorm and dmsnorm
added in Levy's alpha stable distribution for simulation
added new code for simulation under different distribution assumption
Added presentation of 2012-11-28
readin in of json files for frames in ui
decode: add function clear_decoded_networks

Signed-off-by: Michael Krufky <mk@valley.nyc.rr.com>
Corrected a this. vs. Phylowood. pointer mistake that caused updateDisplay() to loop indefinitely.
Updated for jslint; fixed confusing code; reformatted
add: allow to chain calls to "on()" func.
fix bug in renameField in case of duplicate column names
add test to check for different line endings
Merge pull request #61 from dennishendriksen/testing

AbstractTupleReader bug fix and TextFileUtils tests
Writing down some thoughts
Own webpage.
finished all updates to dna chart (0.1.06)

- updated the dna chart range calculations
- updated the data plotting on the dna chart
- updated the y-bar value increments and plotting
- updated the grid positions
Blah
Ok
popwin sucks
Rename, plus Org mode
Org mode
working on hil voice -- magic incantation (on Windows box):
TMP=. ../rg2vox.py hil.rg Voicey b1 ogi_mwm5_diphone/3+ogi_aec_diphone/2.25+ogi_rab_diphone/4.5
added a7 forced
Use Mortar Development Framework terms for user facing files/messages.
Merge pull request #35 from mortardata/jkarn_dev_framework_terminology

Use Mortar Development Framework terms for user facing files/messages.
Merge branch 'master' of https://github.com/pdelprat/MOSA-Project
- Renamed Mosa.Kernel to Mosa.Kernel.x86
- Renamed Mosa.Kernel to Mosa.Kernel.x86
- Created Mosa.Kernel.AVR32
- Updated nant files
Aravind | #2063 | Hostname puppet configuration.
Luka, Sri | #31 | Showing an indication on the UI that the current treatment is paused on the patient list and also on the adherence capture page
Vishal, BalajiN | #19 | Refactoring for setting up dashboard

	1. Commons were moved into org.motechproject.whp.commons packages
	2. Constants was moved from ref data to common
	3. Removed patient DTO
Get rid of annoying "useless expression" warnings.
use more obvious form of for each iteration.
Merge pull request #430 from Gozala/hotfix/emit-warnings@752051

fix Bug 752051 - Get rid of annoying "useless expression" warnings. r=@chameau
add a test for /wsapi/logout.js which was not called except for tests/stalled-mysql-test.js for failure and tests/cookie-session-security-test.js when not authenticated, so actually never called for effect
Merge pull request #2832 from jrgm/logout-test

add a test for /wsapi/logout.js which was not called in back tests

r+ We like tests.
Changing BigTent config to allow for multiple BT endpoints.

Config is an assoc array with key as IdP domain and value as BigTent URLs

Changed primary to idp per stomlinson

Removed debug log line

Conflicts:

	lib/configuration.js
	lib/wsapi/address_info.js
Fix cookie check in IE8

IE8 doesn't know how to handle max-age when setting cookies turning the "cookie check cookie" into a session cookie.  Using expires=<date> as well.  Manually expire the cookie after its existence is checked for.

1982
Simplify the cookie check.

Never set a future expiration date, to delete the cookie set an expiration date of yesterday.
Merge pull request #1996 from mozilla/issue_1982_ie8_cookie_expires

Fix cookie check cookie made into a session cookie in IE8
primary health check working wut wut
Creating a testidp domain and email address
Merge branch 'primary-transition-tests' of github.com:mozilla/browserid into primary-transition-tests
Bump version to 0.3.1pre
syncing with ryans changes
Fixed an error where the edit table row search query was too large
Added a simple check to check for iSafe.jar
set all properties passed to setOptions

This was only setting the stateProperties, and ignoring properties like
hasControls if they were included in the options.
specify pulp imports
Se implemento el envio de correo en el proceso de Prestamo cuando el credito es autorizado

Signed-off-by: MIGUEL <miguel@miguel-Satellite-L635.(none)>
Add a sample launchd plist for managing Stallion on Mac OS X
fixed issue with pod formatting
plaintext too short error
Setup cleanup

The bootstrap popt table has been moved to core. Now the core implements all defaults
incerc si eu sa adaug unde e deja modificat online
Merge branch 'master' of https://github.com/msmihai/ExifStats

Conflicts:
	src/main.cpp
Aufgabe 24a
add color_highlight plugin
update tlib plugin to version 1.04
Version: 0.2-SNAPSHOT, also depend on that for scct.
Minor updates related to testing exercises
Changed
Fixed conflict
additional check
readonly now is readonly
Don't use templates as constructors for tasks
Split out code to create gzip tarballs to separate module
Remove unused import
Split out code for extracting gzipped tarballs
Remove redundant import
Display index in leaderboard stats output
xp
Merge branch 'master' of https://github.com/mzoneapp/mobileOA.git
Merge branch 'master' of https://github.com/mzoneapp/mobileOA.git
xp
Merge branch 'master' of https://github.com/mzoneapp/mobileOA.git

Conflicts:
	res/layout/tododoc_detail.xml
Objects serialization API changes
81.169.131.92
Implementando shutdown para bugs
[oups] adding Redis support
cleaning Request Object + preparing Curl helper
more version-neutral exception check
Try testing all versions again
Work on recursive SQL, still doesn't work.
first layout draft for samandcat done
Updated format of examples
ignore failed unregistration
vim: nerdtree hidden 파일 관련 옵션 추가:
add challenge display
Merge branch 'master' of https://github.com/netogallo/supris3
clean up tiny miny, add comment foo boo.
Added inbound control system for arming and disarming the alarm system.
Refactor of outbound code.
Added test folder and started writing tests for them. also moved TODO.
Revert "Added test case"

This reverts commit 77991a7f70691b4a2755677e302109cf6225aab5.

Modified files:
 D	Fix.tst
refactored wifi localization Just On Time
refactored error handling on noise measuring
Restructuring & cleaning dotfiles, install script
Updating gitconfig
Adding zsh config
Added restore and backup tasks to rakefile
Creating vim.symlink and moving submodules
Updated Rakefile, added reload! alias
Moving git aliases over to git dir
set defaults, set defaults PS1 (temp)
correcting vim plugin submodule issue
Adding stub for os x configuration script
correcting ^d not working
Adding new dark colorscheme for vim
Removing submodule xorium
correcting issue in Rakefile
Added new vim colorscheme, updated prompt

Added smyck colorscheme, which I foud on reddit today.
Also, copied the prompt from zholman's dotfiles
Updated ir_black theme
added new modules to doc
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Translated using Weblate.
fixed a type in README.md
extracted methods from app_support.rb to helpers.rb
added error handling
added functions to handle YAML settings file
Better Cucumber Steps :)
fixed a syntax error that occurred with ruby 1.8.7 and ree
clicking on the logo shows home feeds
Merge branch 'master' of github.com:nikhiltyagi/sqwag
added profile design
Merge branch 'master' of github.com:nikhiltyagi/sqwag
sisäänlukutiedoston rivien käsittelyä
sign up setup
YAML::ENGINE doesn't exist in Ruby 1.8.7. This is defined in Ruby 1.9.
Merge pull request #3 from geekontheway/master

YAML::ENGINE doesn't exist in Ruby 1.8.7. This is defined in Ruby 1.9.
Trunk add-prefix function corrected
fill in layout

fill in layout
Command rework, safe mode.
Finished layout and routes. Start 5.6/6
[fix] unused code causing ue errors
Move to vundle
Add Vim Pasta for auto indent copy past
Cleanup
change juice for prova png
+ _s./git-deps; ~ _s./upd.-deps (indent)

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
css tweaks, added mixpanel
utility -- snapshot gen proc
Lockless PermissionInfo cache using Guava
Use Guava LoadingCache interface directly
Update web-basics/index.html
additional helper methods
multiple families/qualifiers can be passed to scanner
added leaflet js lib

Added leaflet js and leaflet.providers plugin.
Added a helper map in edit shop profile page.
changed latitude, longitude columns to float of size (10,6)

Float of size (10,6) in MySQL is recommanded by Google Maps documents.
first attempt to implement post controller and views

TODO: authorization, refactoring and tests
cleaned up welcome.js thru decomp and tabbing
add committee meeting to API v2. return protocol divided to parts. #3425
TCP and UDP summaries are added

#TODO: pagination is required
fized new-lines,
added debug variable in calc2d serve method
Basic links to entries and dimensions in json output. 
Add html_url to the remaining controller actions. 
Fix dimension link generation from dimension member. 
Remove non-sensical assert
Make facets a bit larger. 
Allow embedding and change of visualizations in the view/view action. 
[merge]
патчи для работы с несколькими языками
git: stopped ignoring workspace files
git: new and renamed aliases
git: aligned gitconfig assignments
transmission:
 * drop dependencies on libnsl & libresolv, transmission doesin't depend on these libraries (anymore)


git-svn-id: file:///var/svn/freetz/trunk@9556 149334a1-2f27-0410-a3b9-fc62619ac1e6
remove outdated kernel config and patches


git-svn-id: file:///var/svn/freetz/trunk@8859 149334a1-2f27-0410-a3b9-fc62619ac1e6
zlib:
 * bump version to 1.2.7


git-svn-id: file:///var/svn/freetz/trunk@9041 149334a1-2f27-0410-a3b9-fc62619ac1e6
At last, rejected headings are now strikethroughed
Playing around with ICanHaz.js
* Correction du lien.
Merge remote-tracking branch 'origin/master'
add commit bar
translate English words
Release Version for ios Backend on production server
Init commitment
add index page

add view and controller for the index page.
add volumes/elastic_ip, instance ELB exports
fix reload data at explore tableview
Added CodeListItem to code attribute
OFC-176 Add small, light "i" next to fields with description; show
tooltip on mouseover
Merge branch 'reengineering' of github.com:openforis/collect into reengineering
fix issue with opening multiselect after taking values from local storage
GEOS-3885: added documentation
Merge pull request #66 from svzdvd/GEOS3885-doc

GEOS-3885: added documentation
Merge branch 'master' of git://github.com/geoserver/geoserver
fixed various issues. clean up

- "list all" only visible to admins, fixes #46
- FT templates are now read according to templates.lst, fixes #23 and fixes #54
- Identify Requirements: comments are stored when switching, fixes #49
- Take Go Decision: changes are saved, fixes #5
Fix extra closing tag in layout
More flex report form touch-ups
fix aptitude package list for ubuntu build in README
Update notes for submitted changes

* Fix status output for ref changes.
Appropriately inject build_sphinx options.

Change-Id: I039f8fbd6b16d754ccfd036b4b60419ad315b896
Update notes for submitted changes

* Cleans up instance log page, form, HTML/styles...
add test for create subnet with default gateway and conflict allocation pool

Create subnet with default gateway and conflict allocation pool should return
status code 409:
$ quantum subnet-create net1 --allocation-pool start=10.0.0.1,end=10.0.0.5 \
10.0.0.0/24
Found overlapping allocation pools:{u'start': u'10.0.0.1',
u'end': u'10.0.0.5'} 10.0.0.1 for subnet 10.0.0.0/24.

Change-Id: I8608314ad7899a752eea239dbe224e25c00a375b
Merge "add test for create subnet with default gateway and conflict allocation pool"
Update notes for submitted changes

* Reenable security group related test case
GETs on first level

GETs work on level 1
Using url_for
Including RDF module
using libs in '/lib'
fix block=smallheader boilerplates in misc module
print statement cleanup
edithost redesigned, should be fully functional
better syntax examples in Recipe DSL
Fix list expectation
return false if command_available throws an exception
Show a message when listing sheets and sheets directory doesn't exist
Replaces the path of the polyline in each planning instead of adding new ones.
remove not empty dirs
Fix issue "No sound with 0.7-SNAPSHOT under Linux"

* Set connection-info* before booting the server.
* Make transient-server? return true, like the docstring says.
Actually throw exception on inactive node modification error
Add glitch metadata from extra ugens
Content added, remember to place in namespace
Merge branch 'master' of github.com:oxycoon/Solsystem
modifica README
aggiunto file prova
Coord constructor
Merge branch 'master' of https://github.com/padavoine/ChessAI
0.0.3
0.04
adds a couple of detection points
Cleanup in config.d, starting to get clearer.
Configuration Support multi-touch touch-screen
added new series to de-only
stm & IO
abandoned comonadic approach
abandoned comonadic approach
cambio look
zsh: make ^N/^P act like vim's cmdline, use ^F/^B for completion
pushing images into images/ directory
a logo for the header.
third try?
zsh: use my theme and a github secrets file
add gitconfig/ignore
add title string setter
I've come far
Replace before all with more idiomatic RSpec let
Added new setting HIDE_ANALYTICS_IF_STAFF to allow user to disable ganalytics tracking when logged in as a staff member
Dropdown de categorías ordenado alfabéticamente en form de sources
Eliminación de código innecesario
Mejoras y correcciones en display de artículos
Close to Post/ajax call for assigning users to a task
Avoid line continuation in import statements.

This is a bit ugly, but also complicates automated updates to import lines
Update exception style in PAML
Update exception raising style
Update exception raising style in GenomeDiagram
Very hacky 2to3 import updates

Not working 100%, triple quotes in a couple of files are confusing
the very simple parsing. Also will either need to add 'as' clauses
to the import statements, or fix the main body of the code as well.
e.g. 'from Bio import SeqIO' --> 'from bio import seqio' works,
but need to change 'SeqIO.parse(...)' to 'seqio.parse(...)' too.
Or use 'from bio import seqio as SeqIO' but that seems ugly.
Split-up a multi-line import
protect against all_tags being missing
AS7-5993 Drop BARRIER from default JGroups protocol stacks
FIX: ensure date input has a date picker to trigger open (#7504)
Merge pull request #757 from wilr/trac/7504

FIX: ensure date input has a date picker to trigger open (#7504).
BUG Fix wrong date conversion from PHP format 'y' to jquery date and back.

While 'y' in PHP means 4 digits year (e.g. 2012), jquery date picker means 2 digits (e.g. 12). That's all fine until then but when you pass the 2 digit year value back to PHP it all goes awry.
For exmple, defatult date format in en_US is 'MMM d, y' so in jquery date picker it's something like this 'Aug 22, 12' and eventually PHP will convert that value to '0012-08-22' which completely wrong.
FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang"
MINOR Use consistent ed.getLang method
Merge pull request #759 from patbolo/bugfix/7832

FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang"
better start values for partcomp, and change upper limit for guessing to .7
fixed camera's never working fix #115
Merge branch 'master' of github.com:philihp/WebLabora
Merge branch 'master' into production

Conflicts:
	src/main/java/com/philihp/weblabora/model/building/Camera.java
ADD:add some function to class Agent.
project_id FTW
Added backend that sends an email when a request is submitted. Included test to cover this functionality
Revert "deleted"
reverted
This reverts commit 1c796de7d99d734569246faaff13a7c6e1436db3.
added new feature - add to calendar, nice for reminders later. really like that one.
Added choppable test to char util
Commiting original script
To avoid concurrency issue, do not touch queue time in ISR land
add matrix style
Added filter for Dart
Fixed DEBUG/STATIC_URL settings
Implement mobile asset tests

Added .DS_Store to .gitignore
Update the gtk2 user interface for nero and wavpack.
Add the nero + wavpack options to the command line interface.
refactored zshrc
Electric and Magnetic Test
Split Engine and Renderer
Something about injection and failure
Fetching album art is an authenticated operation
Create a more sensible way to load/save login creds
Fire the timer on startup
If images fail to load, don't die
I don't even know, test some stuff
Revert subpackage work, added as separate package to match other plugins.
- disabled evolution miner by default (added evolution bcond) till upstream will add new evolution API
MIT PUATOOLBOX - PUATOOLBOX SYMFONY2 PUATOOLBOX BUNDLE TAG RESOURCE LAYOUT CHECK IN.
wk04-A2
mv defaults.__init__.py to tasks/init.py
make Jinja2 replaceable with Mako: `easy_install acrylamid --mako`, see #53
pyflake minors
Another typographical correction.

Noted by Guillaume Smet.
If the requested Ruby is already in use, return (closes #4).
Removed dependence on LAPACK's Cholesky factorization
remove bitcodes file from repo
add data store scheme for blog post
remove try block in parseToHtmlDOM
change content type of feed
change field name of BlogPostEntry
[ObjectHeap] Add function getTypeAmount()
[Merge] Merge branch 'ObjectHeap' into dev.